Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: configuration cleanups ......................................................................
packaging: configuration cleanups - install isouploader.conf with 0640 access mode - avoid to install hidden empty files for creating an empty configuration directory Change-Id: I015e614821c21715c99af0abe398687bb2e39422 Bug-Url: https://bugzilla.redhat.com/1058807 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M ovirt-iso-uploader.spec.in D src/.keep M src/Makefile.am 3 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-iso-uploader refs/changes/36/24536/1 diff --git a/ovirt-iso-uploader.spec.in b/ovirt-iso-uploader.spec.in index 0fd2d21..98db9e8 100644 --- a/ovirt-iso-uploader.spec.in +++ b/ovirt-iso-uploader.spec.in @@ -55,9 +55,9 @@ %doc AUTHORS %doc COPYING %dir %{_localstatedir}/log/ovirt-engine/%{package_name} -%config(noreplace) %{_sysconfdir}/ovirt-engine/isouploader.conf +%dir %{_sysconfdir}/ovirt-engine/isouploader.conf.d + %attr(0640, -, -) %config(noreplace) %{_sysconfdir}/ovirt-engine/isouploader.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{package_name} -%{_sysconfdir}/ovirt-engine/isouploader.conf.d/.keep %{python_sitelib}/ovirt_iso_uploader/*.py* %{_bindir}/ovirt-iso-uploader %{_bindir}/engine-iso-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 b6ea264..44de16c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,9 +53,6 @@ $(NULL) confddir=$(engineconfigdir)/isouploader.conf.d -dist_confd_DATA = \ - .keep \ - $(NULL) config.py: config.py.in $(SED) \ @@ -71,9 +68,11 @@ $(NULL) install-data-hook: + $(MKDIR_P) "$(DESTDIR)$(confddir)" $(MKDIR_P) "$(DESTDIR)$(bindir)" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/ovirt-engine/$(PACKAGE_NAME)" chmod a+x "$(DESTDIR)$(ovirtisouploaderlibdir)/__main__.py" + chmod 640 "$(DESTDIR)$(engineconfigdir)/isouploader.conf" rm -f "$(DESTDIR)$(bindir)/ovirt-iso-uploader" rm -f "$(DESTDIR)$(bindir)/engine-iso-uploader" $(LN_S) "$(ovirtisouploaderlibdir)/__main__.py" "$(DESTDIR)$(bindir)/ovirt-iso-uploader" -- To view, visit http://gerrit.ovirt.org/24536 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I015e614821c21715c99af0abe398687bb2e39422 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-iso-uploader Gerrit-Branch: ovirt-iso-uploader-3.4 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
