Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: remove usage of /etc/ovirt-engine for configuration files ......................................................................
packaging: remove usage of /etc/ovirt-engine for configuration files only trust store is there, and it is recreated every setup, so no need to upgrade anything. Change-Id: I50320bbc058e529009ae73ae22423b72fabe6d5d Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M ovirt-engine-reports.spec.in M packaging/legacy-setup/ovirt-engine-reports-setup.py 3 files changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/11/23311/1 diff --git a/Makefile b/Makefile index 415e2e9..997607a 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ DATA_DIR=$(DATAROOT_DIR)/$(OVIRT_REPORTS_NAME) MAVENPOM_DIR=$(DATAROOT_DIR)/maven-poms JAVA_DIR=$(DATAROOT_DIR)/java -PKG_SYSCONF_DIR=$(SYSCONF_DIR)/ovirt-engine +PKG_SYSCONF_DIR=$(SYSCONF_DIR)/ovirt-engine-reports PKG_JAVA_DIR=$(JAVA_DIR)/$(OVIRT_REPORTS_NAME) RPMBUILD=rpmbuild PYTHON=python @@ -152,9 +152,8 @@ done 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)/ovirt-engine-reports.conf.d + install -d $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/engine.conf.d + install -d $(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-engine-reports.conf.d install -d $(DESTDIR)$(BIN_DIR) install -d $(DESTDIR)$(DATA_DIR)/conf install -d $(DESTDIR)$(DATA_DIR)/legacy-setup @@ -162,7 +161,7 @@ install -d $(DESTDIR)$(DATA_DIR)/server-customizations cp -a reports/repository_files/* $(DESTDIR)$(DATA_DIR)/reports - install -p -m 644 packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d + install -p -m 644 packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/engine.conf.d install -p -m 755 packaging/legacy-setup/ssl2jkstrust.py $(DESTDIR)$(DATA_DIR)/legacy-setup install -p -m 755 packaging/legacy-setup/ovirt-engine-reports-setup.py $(DESTDIR)$(DATA_DIR)/legacy-setup install -p -m 755 packaging/legacy-setup/common_utils.py $(DESTDIR)$(DATA_DIR)/legacy-setup diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index 2ed81de..a500562 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -119,10 +119,8 @@ fi %files -%dir %attr(-, %{engine_user}, %{engine_group}) %{_sysconfdir}/%{reports_name}/ovirt-engine-reports.conf.d - +%dir %{_sysconfdir}/%{reports_name}/ovirt-engine-reports.conf.d %{_sysconfdir}/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf -%{_sysconfdir}/ovirt-engine/ovirt-engine-reports %{reports_java} %{_datadir}/%{reports_name} %if "%{name}" != "%{reports_name}" diff --git a/packaging/legacy-setup/ovirt-engine-reports-setup.py b/packaging/legacy-setup/ovirt-engine-reports-setup.py index 38d12ff..ba56957 100755 --- a/packaging/legacy-setup/ovirt-engine-reports-setup.py +++ b/packaging/legacy-setup/ovirt-engine-reports-setup.py @@ -71,7 +71,7 @@ FILE_DEPLOY_VERSION = "/etc/ovirt-engine/jrs-deployment.version" OVIRT_SETUP_POST_INSTALL_CONFIG = "/etc/ovirt-engine-setup.conf.d/20-setup-ovirt-post.conf" -OVIRT_REPORTS_ETC="/etc/ovirt-engine/ovirt-engine-reports" +OVIRT_REPORTS_ETC="/etc/ovirt-engine-reports" OVIRT_REPORTS_TRUST_STORE="%s/trust.jks" % OVIRT_REPORTS_ETC OVIRT_REPORTS_TRUST_STORE_PASS="mypass" -- To view, visit http://gerrit.ovirt.org/23311 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50320bbc058e529009ae73ae22423b72fabe6d5d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
