Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: complete the transition of packaging filesystem like structure ......................................................................
packaging: complete the transition of packaging filesystem like structure move files within the packaging/fedora/setup. Change-Id: I637d1659a528ad4a0e7539faaa80cb1d9a80c154 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile R packaging/conf/iptables.default R packaging/conf/nfs.sysconfig R packaging/conf/ovirt-engine-proxy.conf.in R packaging/conf/ovirt-engine-root-redirect.conf.in 5 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/14435/1 diff --git a/Makefile b/Makefile index 68be17a..e7e940e 100644 --- a/Makefile +++ b/Makefile @@ -275,15 +275,15 @@ # Configuration files: install -m 644 packaging/conf/engine-config-install.properties $(DESTDIR)$(DATA_DIR)/conf - install -m 644 packaging/fedora/setup/iptables.default $(DESTDIR)$(DATA_DIR)/conf + install -m 644 packaging/conf/iptables.default $(DESTDIR)$(DATA_DIR)/conf #FirewallD install -m 644 packaging/firewalld/base/ovirt-nfs.xml.in $(DESTDIR)$(DATA_DIR)/firewalld/base/ovirt-nfs.xml.in install -m 644 packaging/firewalld/base/ovirt-http.xml.in $(DESTDIR)$(DATA_DIR)/firewalld/base/ovirt-http.xml.in install -m 644 packaging/firewalld/base/ovirt-https.xml.in $(DESTDIR)$(DATA_DIR)/firewalld/base/ovirt-https.xml.in - install -m 644 packaging/fedora/setup/nfs.sysconfig $(DESTDIR)$(DATA_DIR)/conf - install -m 644 packaging/fedora/setup/ovirt-engine-proxy.conf.in $(DESTDIR)$(DATA_DIR)/conf - install -m 644 packaging/fedora/setup/ovirt-engine-root-redirect.conf.in $(DESTDIR)$(DATA_DIR)/conf + install -m 644 packaging/conf/nfs.sysconfig $(DESTDIR)$(DATA_DIR)/conf + install -m 644 packaging/conf/ovirt-engine-proxy.conf.in $(DESTDIR)$(DATA_DIR)/conf + install -m 644 packaging/conf/ovirt-engine-root-redirect.conf.in $(DESTDIR)$(DATA_DIR)/conf # Shared python modules: install -m 644 packaging/fedora/setup/nfsutils.py $(DESTDIR)$(DATA_DIR)/scripts diff --git a/packaging/fedora/setup/iptables.default b/packaging/conf/iptables.default similarity index 100% rename from packaging/fedora/setup/iptables.default rename to packaging/conf/iptables.default diff --git a/packaging/fedora/setup/nfs.sysconfig b/packaging/conf/nfs.sysconfig similarity index 100% rename from packaging/fedora/setup/nfs.sysconfig rename to packaging/conf/nfs.sysconfig diff --git a/packaging/fedora/setup/ovirt-engine-proxy.conf.in b/packaging/conf/ovirt-engine-proxy.conf.in similarity index 100% rename from packaging/fedora/setup/ovirt-engine-proxy.conf.in rename to packaging/conf/ovirt-engine-proxy.conf.in diff --git a/packaging/fedora/setup/ovirt-engine-root-redirect.conf.in b/packaging/conf/ovirt-engine-root-redirect.conf.in similarity index 100% rename from packaging/fedora/setup/ovirt-engine-root-redirect.conf.in rename to packaging/conf/ovirt-engine-root-redirect.conf.in -- To view, visit http://gerrit.ovirt.org/14435 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I637d1659a528ad4a0e7539faaa80cb1d9a80c154 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
