Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: configuration cleanups ......................................................................
packaging: configuration cleanups - install imageuploader.conf with 0640 access mode - avoid to install hidden empty files for creating an empty configuration directory Change-Id: Idb1559da5d95e723d4b9c2b45760a71700d865f8 Bug-Url: https://bugzilla.redhat.com/1058810 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-image-uploader.spec.in D src/.keep M src/Makefile.am 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-image-uploader refs/changes/41/24841/1 diff --git a/ovirt-image-uploader.spec.in b/ovirt-image-uploader.spec.in index 06f0453..278642e 100644 --- a/ovirt-image-uploader.spec.in +++ b/ovirt-image-uploader.spec.in @@ -46,6 +46,7 @@ %configure \ --docdir="%{_docdir}/%{package_name}-%{version}" \ --disable-python-syntax-check + make %{?_smp_mflags} %check @@ -59,9 +60,9 @@ %doc AUTHORS %doc COPYING %dir %{_localstatedir}/log/ovirt-engine/%{package_name} -%config(noreplace) %{_sysconfdir}/ovirt-engine/imageuploader.conf +%dir %{_sysconfdir}/ovirt-engine/imageuploader.conf.d + %attr(0640, -, -) %config(noreplace) %{_sysconfdir}/ovirt-engine/imageuploader.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{package_name} -%{_sysconfdir}/ovirt-engine/imageuploader.conf.d/.keep %{python_sitelib}/ovirt_image_uploader/*.py* %{python_sitelib}/ovirt_image_uploader/ovf/*.py* %{_bindir}/engine-image-uploader diff --git a/src/.keep b/src/.keep deleted file mode 100644 index e69de29..0000000 --- a/src/.keep +++ /dev/null diff --git a/src/Makefile.am b/src/Makefile.am index 491ac5a..9f48ebb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,9 +53,6 @@ $(NULL) confddir=$(engineconfigdir)/imageuploader.conf.d -dist_confd_DATA =\ - .keep \ - $(NULL) config.py: config.py.in $(SED) \ @@ -71,8 +68,10 @@ $(NULL) install-data-hook: + $(MKDIR_P) "$(DESTDIR)$(confddir)" $(MKDIR_P) "$(DESTDIR)$(bindir)" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/ovirt-engine/$(PACKAGE_NAME)" + chmod 640 "$(DESTDIR)$(engineconfigdir)/imageuploader.conf" chmod a+x "$(DESTDIR)$(ovirtimageuploaderlibdir)/__main__.py" rm -f "$(DESTDIR)$(bindir)/engine-image-uploader" $(LN_S) "$(ovirtimageuploaderlibdir)/__main__.py" "$(DESTDIR)$(bindir)/engine-image-uploader" -- To view, visit http://gerrit.ovirt.org/24841 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb1559da5d95e723d4b9c2b45760a71700d865f8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-image-uploader Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
