Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: reorder packaging to meet physical layout
......................................................................
packaging: reorder packaging to meet physical layout
Change-Id: I35e95e689adc1fc8bbc487a63c094817ae5b1cdb
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile
R packaging/conf/default_master.properties
R packaging/conf/reports.xml
R packaging/legacy-setup/common_utils.py
R packaging/legacy-setup/decorators.py
R packaging/legacy-setup/ovirt-engine-reports-setup.py
R packaging/legacy-setup/ssl2jkstrust.py
R packaging/sys-etc/httpd/conf.d/z-ovirt-engine-reports-proxy.conf
R packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf
9 files changed, 14 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/09/23309/1
diff --git a/Makefile b/Makefile
index 3c26ba7..ffb258e 100644
--- a/Makefile
+++ b/Makefile
@@ -157,19 +157,20 @@
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)
+ install -d $(DESTDIR)$(DATA_DIR)/conf
+ install -d $(DESTDIR)$(DATA_DIR)/legacy-setup
install -d $(DESTDIR)$(DATA_DIR)/reports
install -d $(DESTDIR)$(DATA_DIR)/server-customizations
cp -a reports/repository_files/* $(DESTDIR)$(DATA_DIR)/reports
- 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)
- install -p -m 755 packaging/ovirt-engine-reports-setup.py
$(DESTDIR)$(DATA_DIR)
- install -p -m 755 packaging/common_utils.py $(DESTDIR)$(DATA_DIR)
- install -p -m 755 packaging/decorators.py $(DESTDIR)$(DATA_DIR)
- install -p -m 644 packaging/default_master.properties
$(DESTDIR)$(DATA_DIR)
- install -p -m 644 reports/reports.xml $(DESTDIR)$(DATA_DIR)
+ 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/httpd/conf.d/z-ovirt-engine-reports-proxy.conf
$(DESTDIR)$(SYSCONF_DIR)/httpd/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
+ install -p -m 755 packaging/legacy-setup/decorators.py
$(DESTDIR)$(DATA_DIR)/legacy-setup
+ install -p -m 644 packaging/conf/default_master.properties
$(DESTDIR)$(DATA_DIR)/conf
+ install -p -m 644 packaging/conf/reports.xml $(DESTDIR)$(DATA_DIR)/conf
cp -rpf server-customizations/*
$(DESTDIR)$(DATA_DIR)/server-customizations
- ln -s -f $(DATA_DIR)/$(OVIRT_REPORTS_NAME)-setup.py
$(DESTDIR)$(BIN_DIR)/$(OVIRT_REPORTS_NAME)-setup
+ ln -s -f $(DATA_DIR)/legacy-setup/$(OVIRT_REPORTS_NAME)-setup.py
$(DESTDIR)$(BIN_DIR)/$(OVIRT_REPORTS_NAME)-setup
diff --git a/packaging/default_master.properties
b/packaging/conf/default_master.properties
similarity index 100%
rename from packaging/default_master.properties
rename to packaging/conf/default_master.properties
diff --git a/reports/reports.xml b/packaging/conf/reports.xml
similarity index 100%
rename from reports/reports.xml
rename to packaging/conf/reports.xml
diff --git a/packaging/common_utils.py b/packaging/legacy-setup/common_utils.py
similarity index 100%
rename from packaging/common_utils.py
rename to packaging/legacy-setup/common_utils.py
diff --git a/packaging/decorators.py b/packaging/legacy-setup/decorators.py
similarity index 100%
rename from packaging/decorators.py
rename to packaging/legacy-setup/decorators.py
diff --git a/packaging/ovirt-engine-reports-setup.py
b/packaging/legacy-setup/ovirt-engine-reports-setup.py
similarity index 98%
rename from packaging/ovirt-engine-reports-setup.py
rename to packaging/legacy-setup/ovirt-engine-reports-setup.py
index 27ca474..dd2e74c 100755
--- a/packaging/ovirt-engine-reports-setup.py
+++ b/packaging/legacy-setup/ovirt-engine-reports-setup.py
@@ -62,7 +62,7 @@
FILE_ENGINE_CONF = "/etc/ovirt-engine/engine.conf"
REPORTS_PACKAGE_DIR = "/usr/share/ovirt-engine-reports"
-SSL2JKSTRUST = "%s/ssl2jkstrust.py" % REPORTS_PACKAGE_DIR
+SSL2JKSTRUST = "%s/legacy-setup/ssl2jkstrust.py" % REPORTS_PACKAGE_DIR
FILE_DB_DATA_SOURCE =
"%s/reports/resources/reports_resources/JDBC/data_sources/ovirt.xml" %
REPORTS_PACKAGE_DIR
DIR_REPORTS_CUSTOMIZATION="%s/server-customizations" % REPORTS_PACKAGE_DIR
DIR_OVIRT_THEME="%s/reports/resources/themes/ovirt-002dreports-002dtheme" %
REPORTS_PACKAGE_DIR
@@ -330,7 +330,7 @@
@transactionDisplay("Setting DB connectivity")
def setDBConn():
- shutil.copyfile("%s/default_master.properties" % REPORTS_PACKAGE_DIR,
FILE_JASPER_DB_CONN)
+ shutil.copyfile("%s/conf/default_master.properties" % REPORTS_PACKAGE_DIR,
FILE_JASPER_DB_CONN)
if db_dict['password']:
setDeploymentDetails(db_dict)
else:
@@ -1174,7 +1174,7 @@
configureRepository(adminPass)
# Copy reports xml to engine
- shutil.copy2("%s/reports.xml" % REPORTS_PACKAGE_DIR,
'/var/lib/ovirt-engine/reports.xml')
+ shutil.copy2("%s/conf/reports.xml" % REPORTS_PACKAGE_DIR,
'/var/lib/ovirt-engine/reports.xml')
# Delete default properties files
if os.path.exists(FILE_JASPER_DB_CONN):
diff --git a/packaging/ssl2jkstrust.py b/packaging/legacy-setup/ssl2jkstrust.py
similarity index 100%
rename from packaging/ssl2jkstrust.py
rename to packaging/legacy-setup/ssl2jkstrust.py
diff --git a/packaging/z-ovirt-engine-reports-proxy.conf
b/packaging/sys-etc/httpd/conf.d/z-ovirt-engine-reports-proxy.conf
similarity index 100%
rename from packaging/z-ovirt-engine-reports-proxy.conf
rename to packaging/sys-etc/httpd/conf.d/z-ovirt-engine-reports-proxy.conf
diff --git a/packaging/50-ovirt-engine-reports.conf
b/packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf
similarity index 100%
rename from packaging/50-ovirt-engine-reports.conf
rename to
packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf
--
To view, visit http://gerrit.ovirt.org/23309
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35e95e689adc1fc8bbc487a63c094817ae5b1cdb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
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
