Alex Lourie has uploaded a new change for review. Change subject: packaging: Moved config file and backups from /usr (#805516) ......................................................................
packaging: Moved config file and backups from /usr (#805516) https://bugzilla.redhat.com/show_bug.cgi?id=805516 * Moved iptables.example file (temp file for overriding iptables) to /etc/ovirt-engine/ * Changed DB backup folder to /var/lib/ovirt-engine/backup Change-Id: I9a969c12f0373cc5e6daba358c9b5d87c02c44e1 Signed-off-by: Alex Lourie <[email protected]> --- M packaging/fedora/setup/basedefs.py M packaging/fedora/spec/ovirt-engine.spec.in 2 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/7139/1 diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index b080f04..d9c538c 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -54,7 +54,7 @@ DIR_ENGINE_EAR="%s/ovirt-engine/engine.ear" % DIR_USR_SHARE DIR_DB_SCRIPTS="%s/ovirt-engine/dbscripts/" % DIR_USR_SHARE -DIR_DB_BACKUPS="%s/ovirt-engine/db-backups" % DIR_USR_SHARE +DIR_DB_BACKUPS="%s/ovirt-engine/backup" % DIR_VAR_LIB DIR_ENGINE_CONFIG="%s/ovirt-engine/engine-config/" % DIR_USR_SHARE DIR_RHEVM_CONFIG_CONF="/etc/ovirt-engine/engine-config/" DIR_OVIRT_PKI="/etc/pki/ovirt-engine" @@ -77,8 +77,8 @@ FILE_RESOLV_CONF="/etc/resolv.conf" FILE_SLIMMING_PROFILE_CONF="/usr/share/ovirt-engine/conf/slimming.conf" FILE_IPTABLES_DEFAULT="%s/ovirt-engine/conf/iptables.default" % DIR_USR_SHARE -FILE_IPTABLES_EXAMPLE="%s/ovirt-engine/conf/iptables.example" % DIR_USR_SHARE -FILE_IPTABLES_BACKUP="%s/ovirt-engine/conf/iptables.backup" % DIR_USR_SHARE +FILE_IPTABLES_EXAMPLE="/etc/ovirt-engine/iptables.example" +FILE_IPTABLES_BACKUP="%s/ovirt-engine/backup/iptables.backup" % DIR_VAR_LIB FILE_NFS_SYSCONFIG="%s/ovirt-engine/conf/nfs.sysconfig" % DIR_USR_SHARE FILE_NFS_BACKUP="%s/ovirt-engine/conf/nfs.backup" % DIR_USR_SHARE FILE_ETC_EXPORTS="/etc/exports" diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 219805b..81d9de5 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -343,6 +343,7 @@ install -dm 755 %{buildroot}/%{engine_state}/deployments install -dm 755 %{buildroot}/%{engine_state}/content +install -dm 755 %{buildroot}/%{engine_state}/backup install -dm 755 %{buildroot}/%{engine_log}/{notifier,engine-manage-domains} install -dm 755 %{buildroot}/%{engine_run}/notifier install -dm 755 %{buildroot}/%{engine_lock} @@ -642,9 +643,9 @@ %{_mavenpomdir}/JPP.%{name}-vdsbroker.pom %endif -# Directories for the deployments and contents files need to be -# owned by the engine user because the application server needs to -# write to them: +# Directories for the backup, deployments and contents files need to be +# owned by the engine user because the setup/upgrade wizard or applications +# server need to write to them: %attr(-, %{engine_user}, %{engine_group}) %{engine_state} # The backend owns the directory of the ear and most of its contents, -- To view, visit http://gerrit.ovirt.org/7139 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a969c12f0373cc5e6daba358c9b5d87c02c44e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alex Lourie <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
