Yaniv Dary has uploaded a new change for review. Change subject: packaging: rename engine-reports.conf.d to ovirt-engine-reports.conf.d ......................................................................
packaging: rename engine-reports.conf.d to ovirt-engine-reports.conf.d Also renamed dwh configuration directory to match current. Change-Id: Ib25cf566c9b3759ffac32ecc744c5fc547a7f677 Bug-Url: https://bugzilla.redhat.com/1043957 Signed-off-by: Yaniv Dary <yd...@redhat.com> --- M Makefile M packaging/common_utils.py M packaging/ovirt-engine-reports-setup.py M packaging/ovirt-engine-reports.spec.in 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/26/22526/1 diff --git a/Makefile b/Makefile index 3515181..8a20d3d 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ install_files: install -d $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d install -d $(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-engine-reports - install -d $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_REPORTS_NAME)/engine-reports.conf.d + install -d $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_REPORTS_NAME)/ovirt-engine-reports.conf.d install -d $(DESTDIR)$(BIN_DIR) install -d $(DESTDIR)$(SYSCONF_DIR)/httpd/conf.d install -d $(DESTDIR)$(DATA_DIR) @@ -161,7 +161,7 @@ install -d $(DESTDIR)$(DATA_DIR)/server-customizations cp -a reports/repository_files/* $(DESTDIR)$(DATA_DIR)/reports - install -p -m 660 packaging/10-setup-database-reports.conf $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_REPORTS_NAME)/engine-reports.conf.d + install -p -m 660 packaging/10-setup-database-reports.conf $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_REPORTS_NAME)/ovirt-engine-reports.conf.d install -p -m 644 packaging/50-ovirt-engine-reports.conf $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d install -p -m 644 packaging/z-ovirt-engine-reports-proxy.conf $(DESTDIR)$(SYSCONF_DIR)/httpd/conf.d install -p -m 755 packaging/ssl2jkstrust.py $(DESTDIR)$(DATA_DIR) diff --git a/packaging/common_utils.py b/packaging/common_utils.py index 011426b..657b1af 100755 --- a/packaging/common_utils.py +++ b/packaging/common_utils.py @@ -37,7 +37,7 @@ EXEC_CHKCONFIG="/sbin/chkconfig" FILE_PG_PASS="/etc/ovirt-engine/.pgpass" -DIR_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/engine-reports.conf.d/" +DIR_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/ovirt-engine-reports.conf.d/" FILE_DATABASE_REPORTS_CONFIG = "10-setup-database-reports.conf" PGPASS_FILE_USER_LINE = "DB USER credentials" PGPASS_FILE_ADMIN_LINE = "DB ADMIN credentials" diff --git a/packaging/ovirt-engine-reports-setup.py b/packaging/ovirt-engine-reports-setup.py index 5548dc3..551ec41 100755 --- a/packaging/ovirt-engine-reports-setup.py +++ b/packaging/ovirt-engine-reports-setup.py @@ -55,8 +55,8 @@ REPORTS_SERVER_BUILDOMATIC_DIR = "%s/buildomatic" % REPORTS_SERVER_DIR FILE_JASPER_DB_CONN = "%s/default_master.properties" % REPORTS_SERVER_BUILDOMATIC_DIR FILE_DATABASE_CONFIG = "/etc/ovirt-engine/engine.conf.d/10-setup-database.conf" -FILE_DATABASE_DWH_CONFIG = "/etc/ovirt-engine-dwh/engine-dwh.conf.d/10-setup-database-dwh.conf" -FILE_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/engine-reports.conf.d/10-setup-database-reports.conf" +FILE_DATABASE_DWH_CONFIG = "/etc/ovirt-engine-dwh/ovirt-engine-dwhd.conf.d/10-setup-database-dwh.conf" +FILE_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/ovirt-engine-reports.conf.d/10-setup-database-reports.conf" FILE_ENGINE_CONF_DEFAULTS = "/usr/share/ovirt-engine/services/ovirt-engine/ovirt-engine.conf" FILE_ENGINE_CONF = "/etc/ovirt-engine/engine.conf" diff --git a/packaging/ovirt-engine-reports.spec.in b/packaging/ovirt-engine-reports.spec.in index 8933323..dda26f1 100644 --- a/packaging/ovirt-engine-reports.spec.in +++ b/packaging/ovirt-engine-reports.spec.in @@ -120,8 +120,8 @@ fi %files -%dir %attr(-, %{engine_user}, %{engine_group}) %{_sysconfdir}/%{reports_name}/engine-reports.conf.d -%config(noreplace) %{_sysconfdir}/%{reports_name}/engine-reports.conf.d/10-setup-database-reports.conf +%dir %attr(-, %{engine_user}, %{engine_group}) %{_sysconfdir}/%{reports_name}/ovirt-engine-reports.conf.d +%config(noreplace) %{_sysconfdir}/%{reports_name}/ovirt-engine-reports.conf.d/10-setup-database-reports.conf %{_sysconfdir}/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf %{_sysconfdir}/ovirt-engine/ovirt-engine-reports -- To view, visit http://gerrit.ovirt.org/22526 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib25cf566c9b3759ffac32ecc744c5fc547a7f677 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Yaniv Dary <yd...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
