Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: move all packaging related to packaging
......................................................................
packaging: move all packaging related to packaging
currently we manage packaging scripts all over the tree, sometimes in
different names than the file installed.
this patch collects all files to be under the packaging directory using
hierarchy similar to the installation and using same file naming.
Change-Id: I6d0bd7b8cd5381ddb80b4b2e5ee7df65bab487bc
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M .gitignore
M Makefile
R packaging/bin/engine-config.sh
R packaging/bin/engine-encrypt-passwd.sh
R packaging/bin/engine-manage-domains.sh
R packaging/bin/engine-notifier-service.sh
R packaging/bin/engine-notifier.sh
R packaging/bin/engine-prolog.sh.in
R packaging/conf/engine-config-install.properties
R packaging/conf/engine.conf.defaults.in
R packaging/conf/jaas.conf
R packaging/etc/engine-config/engine-config.conf
R packaging/etc/engine-config/engine-config.properties
R packaging/etc/engine-config/log4j.xml.in
R packaging/etc/engine-manage-domains/engine-manage-domains.conf
R packaging/etc/engine-manage-domains/log4j.xml.in
R packaging/etc/engine.conf
R packaging/etc/notifier/log4j.xml.in
R packaging/etc/notifier/notifier.conf
R packaging/etc/pki/CreateCA.sh
R packaging/etc/pki/SignReq.lock
R packaging/etc/pki/SignReq.sh
R packaging/etc/pki/cacert.template.in
R packaging/etc/pki/cert.template.in
R packaging/etc/pki/certs/.keep
R packaging/etc/pki/installCA.sh
R packaging/etc/pki/keys/.keep
R packaging/etc/pki/openssl.conf
R packaging/etc/pki/private/.keep
R packaging/etc/pki/requests/.keep
R packaging/etc/sysprep/sysprep.2k12x64
R packaging/etc/sysprep/sysprep.2k3
R packaging/etc/sysprep/sysprep.2k8
R packaging/etc/sysprep/sysprep.2k8x86
R packaging/etc/sysprep/sysprep.w7
R packaging/etc/sysprep/sysprep.w7x64
R packaging/etc/sysprep/sysprep.w8
R packaging/etc/sysprep/sysprep.w8x64
R packaging/etc/sysprep/sysprep.xp
R packaging/etc/usbfilter.txt
40 files changed, 34 insertions(+), 34 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/14302/1
diff --git a/.gitignore b/.gitignore
index 001cabc..154b1fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,11 +42,11 @@
# Files generated from templates
###########################
-backend/manager/conf/engine.conf.defaults
-backend/manager/tools/src/main/shell/engine-prolog.sh
-backend/manager/tools/src/main/conf/engine-config-log4j.xml
-backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml
-backend/manager/tools/src/main/conf/engine-notifier-log4j.xml
+packaging/bin/engine-prolog.sh
+packaging/conf/engine.conf.defaults
+packaging/etc/engine-config/log4j.xml
+packaging/etc/engine-manage-domains/log4j.xml
+packaging/etc/notifier/log4j.xml
packaging/services/config.py
packaging/services/ovirt-engine.systemd
packaging/services/ovirt-engine.sysv
diff --git a/Makefile b/Makefile
index 908ed36..04e645a 100644
--- a/Makefile
+++ b/Makefile
@@ -127,11 +127,11 @@
# List of files that will be generated from templates:
GENERATED = \
- backend/manager/conf/engine.conf.defaults \
- backend/manager/tools/src/main/shell/engine-prolog.sh \
- backend/manager/tools/src/main/conf/engine-config-log4j.xml \
- backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml \
- backend/manager/tools/src/main/conf/engine-notifier-log4j.xml \
+ packaging/bin/engine-prolog.sh \
+ packaging/conf/engine.conf.defaults \
+ packaging/etc/engine-config/log4j.xml \
+ packaging/etc/engine-manage-domains/log4j.xml \
+ packaging/etc/notifier/log4j.xml \
packaging/services/config.py \
packaging/services/ovirt-engine.systemd \
packaging/services/ovirt-engine.sysv \
@@ -273,7 +273,7 @@
@echo "*** Deploying setup executables"
# Configuration files:
- install -m 644 packaging/fedora/setup/engine-config-install.properties
$(DESTDIR)$(DATA_DIR)/conf
+ 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/fedora/setup/firewalld.ovirt.xml
$(DESTDIR)$(SYSCONF_DIR)/firewalld/services/ovirt.xml
install -m 644 packaging/fedora/setup/nfs.sysconfig
$(DESTDIR)$(DATA_DIR)/conf
@@ -330,36 +330,36 @@
install -dm 755 $(DESTDIR)$(PKG_PKI_DIR)/requests
# Configuration files:
- install -m 644 backend/manager/conf/ca/openssl.conf
$(DESTDIR)$(PKG_PKI_DIR)
- install -m 644 backend/manager/conf/ca/cacert.template.in
$(DESTDIR)$(PKG_PKI_DIR)
- install -m 644 backend/manager/conf/ca/cert.template.in
$(DESTDIR)$(PKG_PKI_DIR)
+ install -m 644 packaging/etc/pki/openssl.conf $(DESTDIR)$(PKG_PKI_DIR)
+ install -m 644 packaging/etc/pki/cacert.template.in
$(DESTDIR)$(PKG_PKI_DIR)
+ install -m 644 packaging/etc/pki/cert.template.in
$(DESTDIR)$(PKG_PKI_DIR)
# Scripts:
- install -m 755 backend/manager/conf/ca/*.sh $(DESTDIR)$(PKG_PKI_DIR)
- install -m 644 backend/manager/conf/ca/*.lock $(DESTDIR)$(PKG_PKI_DIR)
+ install -m 755 packaging/etc/pki/*.sh $(DESTDIR)$(PKG_PKI_DIR)
+ install -m 644 packaging/etc/pki/*.lock $(DESTDIR)$(PKG_PKI_DIR)
install_config:
@echo "*** Deploying engine-config & engine-manage-domains"
# Configuration files for the configuration tool:
- install -m 644 backend/manager/tools/src/main/conf/engine-config.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/
- install -m 644
backend/manager/tools/src/main/conf/engine-config*.properties
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/
- install -m 644
backend/manager/tools/src/main/conf/engine-config-log4j.xml
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/log4j.xml
+ install -m 644 packaging/etc/engine-config/engine-config.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/
+ install -m 644 packaging/etc/engine-config/engine-config*.properties
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/
+ install -m 644 packaging/etc/engine-config/log4j.xml
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/log4j.xml
# Main program for the configuration tool:
- install -m 750 backend/manager/tools/src/main/shell/engine-config.sh
$(DESTDIR)$(DATA_DIR)/bin
+ install -m 750 packaging/bin/engine-config.sh $(DESTDIR)$(DATA_DIR)/bin
ln -sf $(DATA_DIR)/bin/engine-config.sh
$(DESTDIR)$(BIN_DIR)/engine-config
# Configuration files for the domain management tool:
- install -m 644
backend/manager/tools/src/main/conf/engine-manage-domains.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains/
- install -m 644
backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains/log4j.xml
+ install -m 644
packaging/etc/engine-manage-domains/engine-manage-domains.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains/
+ install -m 644 packaging/etc/engine-manage-domains/log4j.xml
$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains/
# Main program for the domain management tool:
- install -m 750
backend/manager/tools/src/main/shell/engine-manage-domains.sh
$(DESTDIR)$(DATA_DIR)/bin
+ install -m 750 packaging/bin/engine-manage-domains.sh
$(DESTDIR)$(DATA_DIR)/bin
ln -sf $(DATA_DIR)/bin/engine-manage-domains.sh
$(DESTDIR)$(BIN_DIR)/engine-manage-domains
# Script to encrypt passwords:
- install -m 750
backend/manager/tools/src/main/shell/engine-encrypt-passwd.sh
$(DESTDIR)$(DATA_DIR)/bin
+ install -m 750 packaging/bin/engine-encrypt-passwd.sh
$(DESTDIR)$(DATA_DIR)/bin
# Install man pages
install -m 644 packaging/man/engine-manage-domains.8
$(DESTDIR)$(MAN_DIR)/man8/
@@ -367,7 +367,7 @@
install_sysprep:
@echo "*** Deploying sysperp"
@install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/sysprep
- install -m 644 backend/manager/conf/sysprep/*
$(DESTDIR)$(PKG_SYSCONF_DIR)/sysprep
+ install -m 644 packaging/etc/sysprep/*
$(DESTDIR)$(PKG_SYSCONF_DIR)/sysprep
install_notification_service:
@echo "*** Deploying notification service"
@@ -375,12 +375,12 @@
install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/notifier
# Configuration files:
- install -m 644
backend/manager/tools/src/main/conf/engine-notifier-log4j.xml
$(DESTDIR)$(PKG_SYSCONF_DIR)/notifier/log4j.xml
- install -m 640 backend/manager/tools/src/main/conf/engine-notifier.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/notifier/notifier.conf
+ install -m 644 packaging/etc/notifier/log4j.xml
$(DESTDIR)$(PKG_SYSCONF_DIR)/notifier/log4j.xml
+ install -m 640 packaging/etc/notifier/notifier.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/notifier/notifier.conf
# Main program:
- install -m 755 backend/manager/tools/src/main/shell/engine-notifier.sh
$(DESTDIR)$(DATA_DIR)/bin/engine-notifier.sh
- install -m 755
backend/manager/tools/src/main/shell/engine-notifier-service.sh
$(DESTDIR)$(SYSCONF_DIR)/rc.d/init.d/engine-notifierd
+ install -m 755 packaging/bin/engine-notifier.sh
$(DESTDIR)$(DATA_DIR)/bin/engine-notifier.sh
+ install -m 755 packaging/bin/engine-notifier-service.sh
$(DESTDIR)$(SYSCONF_DIR)/rc.d/init.d/engine-notifierd
install_db_scripts:
@echo "*** Deploying Database scripts"
@@ -394,18 +394,18 @@
@echo "*** Copying additional files"
# Shell scripts used by several programs:
- install -m 755 backend/manager/tools/src/main/shell/engine-prolog.sh
$(DESTDIR)$(DATA_DIR)/bin
+ install -m 755 packaging/bin/engine-prolog.sh $(DESTDIR)$(DATA_DIR)/bin
# Other misc things:
- install -m 644 backend/manager/conf/jaas.conf $(DESTDIR)$(DATA_DIR)/conf
- install -m 644 backend/manager/conf/engine.conf.defaults
$(DESTDIR)$(DATA_DIR)/conf
- install -m 644 backend/manager/conf/engine.conf
$(DESTDIR)$(PKG_SYSCONF_DIR)/
+ install -m 644 packaging/conf/jaas.conf $(DESTDIR)$(DATA_DIR)/conf
+ install -m 644 packaging/conf/engine.conf.defaults
$(DESTDIR)$(DATA_DIR)/conf
+ install -m 644 packaging/etc/engine.conf $(DESTDIR)$(PKG_SYSCONF_DIR)/
install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d
install -m 755 packaging/resources/ovirtlogrot.sh
${DESTDIR}$(DATA_DIR)/scripts/
install -m 755 packaging/resources/ovirt-cron
${DESTDIR}$(SYSCONF_DIR)/cron.daily/
# USB filter:
- install -m 644 frontend/usbfilter.txt $(DESTDIR)$(PKG_SYSCONF_DIR)
+ install -m 644 packaging/etc/usbfilter.txt $(DESTDIR)$(PKG_SYSCONF_DIR)
# Create a version file
echo $(DISPLAY_VERSION) > $(DESTDIR)$(DATA_DIR)/conf/version
diff --git a/backend/manager/tools/src/main/shell/engine-config.sh
b/packaging/bin/engine-config.sh
similarity index 100%
rename from backend/manager/tools/src/main/shell/engine-config.sh
rename to packaging/bin/engine-config.sh
diff --git a/backend/manager/tools/src/main/shell/engine-encrypt-passwd.sh
b/packaging/bin/engine-encrypt-passwd.sh
similarity index 100%
rename from backend/manager/tools/src/main/shell/engine-encrypt-passwd.sh
rename to packaging/bin/engine-encrypt-passwd.sh
diff --git a/backend/manager/tools/src/main/shell/engine-manage-domains.sh
b/packaging/bin/engine-manage-domains.sh
similarity index 100%
rename from backend/manager/tools/src/main/shell/engine-manage-domains.sh
rename to packaging/bin/engine-manage-domains.sh
diff --git a/backend/manager/tools/src/main/shell/engine-notifier-service.sh
b/packaging/bin/engine-notifier-service.sh
similarity index 100%
rename from backend/manager/tools/src/main/shell/engine-notifier-service.sh
rename to packaging/bin/engine-notifier-service.sh
diff --git a/backend/manager/tools/src/main/shell/engine-notifier.sh
b/packaging/bin/engine-notifier.sh
similarity index 100%
rename from backend/manager/tools/src/main/shell/engine-notifier.sh
rename to packaging/bin/engine-notifier.sh
diff --git a/backend/manager/tools/src/main/shell/engine-prolog.sh.in
b/packaging/bin/engine-prolog.sh.in
similarity index 100%
rename from backend/manager/tools/src/main/shell/engine-prolog.sh.in
rename to packaging/bin/engine-prolog.sh.in
diff --git a/packaging/fedora/setup/engine-config-install.properties
b/packaging/conf/engine-config-install.properties
similarity index 100%
rename from packaging/fedora/setup/engine-config-install.properties
rename to packaging/conf/engine-config-install.properties
diff --git a/backend/manager/conf/engine.conf.defaults.in
b/packaging/conf/engine.conf.defaults.in
similarity index 100%
rename from backend/manager/conf/engine.conf.defaults.in
rename to packaging/conf/engine.conf.defaults.in
diff --git a/backend/manager/conf/jaas.conf b/packaging/conf/jaas.conf
similarity index 100%
rename from backend/manager/conf/jaas.conf
rename to packaging/conf/jaas.conf
diff --git a/backend/manager/tools/src/main/conf/engine-config.conf
b/packaging/etc/engine-config/engine-config.conf
similarity index 100%
rename from backend/manager/tools/src/main/conf/engine-config.conf
rename to packaging/etc/engine-config/engine-config.conf
diff --git a/backend/manager/tools/src/main/conf/engine-config.properties
b/packaging/etc/engine-config/engine-config.properties
similarity index 100%
rename from backend/manager/tools/src/main/conf/engine-config.properties
rename to packaging/etc/engine-config/engine-config.properties
diff --git a/backend/manager/tools/src/main/conf/engine-config-log4j.xml.in
b/packaging/etc/engine-config/log4j.xml.in
similarity index 100%
rename from backend/manager/tools/src/main/conf/engine-config-log4j.xml.in
rename to packaging/etc/engine-config/log4j.xml.in
diff --git a/backend/manager/tools/src/main/conf/engine-manage-domains.conf
b/packaging/etc/engine-manage-domains/engine-manage-domains.conf
similarity index 100%
rename from backend/manager/tools/src/main/conf/engine-manage-domains.conf
rename to packaging/etc/engine-manage-domains/engine-manage-domains.conf
diff --git
a/backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml.in
b/packaging/etc/engine-manage-domains/log4j.xml.in
similarity index 100%
rename from
backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml.in
rename to packaging/etc/engine-manage-domains/log4j.xml.in
diff --git a/backend/manager/conf/engine.conf b/packaging/etc/engine.conf
similarity index 100%
rename from backend/manager/conf/engine.conf
rename to packaging/etc/engine.conf
diff --git a/backend/manager/tools/src/main/conf/engine-notifier-log4j.xml.in
b/packaging/etc/notifier/log4j.xml.in
similarity index 100%
rename from backend/manager/tools/src/main/conf/engine-notifier-log4j.xml.in
rename to packaging/etc/notifier/log4j.xml.in
diff --git a/backend/manager/tools/src/main/conf/engine-notifier.conf
b/packaging/etc/notifier/notifier.conf
similarity index 100%
rename from backend/manager/tools/src/main/conf/engine-notifier.conf
rename to packaging/etc/notifier/notifier.conf
diff --git a/backend/manager/conf/ca/CreateCA.sh b/packaging/etc/pki/CreateCA.sh
similarity index 100%
rename from backend/manager/conf/ca/CreateCA.sh
rename to packaging/etc/pki/CreateCA.sh
diff --git a/backend/manager/conf/ca/SignReq.lock
b/packaging/etc/pki/SignReq.lock
similarity index 100%
rename from backend/manager/conf/ca/SignReq.lock
rename to packaging/etc/pki/SignReq.lock
diff --git a/backend/manager/conf/ca/SignReq.sh b/packaging/etc/pki/SignReq.sh
similarity index 100%
rename from backend/manager/conf/ca/SignReq.sh
rename to packaging/etc/pki/SignReq.sh
diff --git a/backend/manager/conf/ca/cacert.template.in
b/packaging/etc/pki/cacert.template.in
similarity index 100%
rename from backend/manager/conf/ca/cacert.template.in
rename to packaging/etc/pki/cacert.template.in
diff --git a/backend/manager/conf/ca/cert.template.in
b/packaging/etc/pki/cert.template.in
similarity index 100%
rename from backend/manager/conf/ca/cert.template.in
rename to packaging/etc/pki/cert.template.in
diff --git a/backend/manager/conf/ca/certs/.keep b/packaging/etc/pki/certs/.keep
similarity index 100%
rename from backend/manager/conf/ca/certs/.keep
rename to packaging/etc/pki/certs/.keep
diff --git a/backend/manager/conf/ca/installCA.sh
b/packaging/etc/pki/installCA.sh
similarity index 100%
rename from backend/manager/conf/ca/installCA.sh
rename to packaging/etc/pki/installCA.sh
diff --git a/backend/manager/conf/ca/keys/.keep b/packaging/etc/pki/keys/.keep
similarity index 100%
rename from backend/manager/conf/ca/keys/.keep
rename to packaging/etc/pki/keys/.keep
diff --git a/backend/manager/conf/ca/openssl.conf
b/packaging/etc/pki/openssl.conf
similarity index 100%
rename from backend/manager/conf/ca/openssl.conf
rename to packaging/etc/pki/openssl.conf
diff --git a/backend/manager/conf/ca/private/.keep
b/packaging/etc/pki/private/.keep
similarity index 100%
rename from backend/manager/conf/ca/private/.keep
rename to packaging/etc/pki/private/.keep
diff --git a/backend/manager/conf/ca/requests/.keep
b/packaging/etc/pki/requests/.keep
similarity index 100%
rename from backend/manager/conf/ca/requests/.keep
rename to packaging/etc/pki/requests/.keep
diff --git a/backend/manager/conf/sysprep/sysprep.2k12x64
b/packaging/etc/sysprep/sysprep.2k12x64
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.2k12x64
rename to packaging/etc/sysprep/sysprep.2k12x64
diff --git a/backend/manager/conf/sysprep/sysprep.2k3
b/packaging/etc/sysprep/sysprep.2k3
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.2k3
rename to packaging/etc/sysprep/sysprep.2k3
diff --git a/backend/manager/conf/sysprep/sysprep.2k8
b/packaging/etc/sysprep/sysprep.2k8
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.2k8
rename to packaging/etc/sysprep/sysprep.2k8
diff --git a/backend/manager/conf/sysprep/sysprep.2k8x86
b/packaging/etc/sysprep/sysprep.2k8x86
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.2k8x86
rename to packaging/etc/sysprep/sysprep.2k8x86
diff --git a/backend/manager/conf/sysprep/sysprep.w7
b/packaging/etc/sysprep/sysprep.w7
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.w7
rename to packaging/etc/sysprep/sysprep.w7
diff --git a/backend/manager/conf/sysprep/sysprep.w7x64
b/packaging/etc/sysprep/sysprep.w7x64
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.w7x64
rename to packaging/etc/sysprep/sysprep.w7x64
diff --git a/backend/manager/conf/sysprep/sysprep.w8
b/packaging/etc/sysprep/sysprep.w8
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.w8
rename to packaging/etc/sysprep/sysprep.w8
diff --git a/backend/manager/conf/sysprep/sysprep.w8x64
b/packaging/etc/sysprep/sysprep.w8x64
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.w8x64
rename to packaging/etc/sysprep/sysprep.w8x64
diff --git a/backend/manager/conf/sysprep/sysprep.xp
b/packaging/etc/sysprep/sysprep.xp
similarity index 100%
rename from backend/manager/conf/sysprep/sysprep.xp
rename to packaging/etc/sysprep/sysprep.xp
diff --git a/frontend/usbfilter.txt b/packaging/etc/usbfilter.txt
similarity index 100%
rename from frontend/usbfilter.txt
rename to packaging/etc/usbfilter.txt
--
To view, visit http://gerrit.ovirt.org/14302
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d0bd7b8cd5381ddb80b4b2e5ee7df65bab487bc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
