Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: engine-service: move service out of fedora into own directory ......................................................................
packaging: engine-service: move service out of fedora into own directory service is working in fedora, rhel, cenots, gentoo, ubuntu. service resources are installed at one directory at target, reorder filesystem structure within source tree to be similar. Change-Id: I38c2653509795ae04c190c4a84f00f53410fa983 Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile M packaging/fedora/spec/ovirt-engine.spec.in R packaging/services/engine-service-logging.properties.in R packaging/services/engine-service.py.in R packaging/services/engine-service.systemd.in R packaging/services/engine-service.sysv.in R packaging/services/engine-service.xml.in 8 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/14151/1 diff --git a/.gitignore b/.gitignore index 437849f..112219c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,7 @@ 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/fedora/engine-service.py -packaging/fedora/engine-service.systemd -packaging/fedora/engine-service.sysv +packaging/services/engine-service.py +packaging/services/engine-service.systemd +packaging/services/engine-service.sysv packaging/fedora/spec/ovirt-engine.spec diff --git a/Makefile b/Makefile index 9adb97d..63ff09c 100644 --- a/Makefile +++ b/Makefile @@ -123,9 +123,9 @@ 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/fedora/engine-service.py \ - packaging/fedora/engine-service.systemd \ - packaging/fedora/engine-service.sysv \ + packaging/services/engine-service.py \ + packaging/services/engine-service.systemd \ + packaging/services/engine-service.sysv \ packaging/fedora/spec/ovirt-engine.spec \ $(NULL) @@ -135,8 +135,8 @@ $(NULL) generated-files: $(GENERATED) - chmod a+x packaging/fedora/engine-service.sysv - chmod a+x packaging/fedora/engine-service.py + chmod a+x packaging/services/engine-service.sysv + chmod a+x packaging/services/engine-service.py $(BUILD_FILE): -[ "$(MAVEN_OUTPUT_DIR_DEFAULT)" = "$(MAVEN_OUTPUT_DIR)" ] && rm -fr "$(MAVEN_OUTPUT_DIR)" @@ -415,7 +415,7 @@ @echo "*** Deploying service" # Install the files: - install -dm 755 $(DESTDIR)$(DATA_DIR)/service - install -m 644 packaging/fedora/engine-service.xml.in $(DESTDIR)$(DATA_DIR)/service - install -m 644 packaging/fedora/engine-service-logging.properties.in $(DESTDIR)$(DATA_DIR)/service - install -m 755 packaging/fedora/engine-service.py $(DESTDIR)$(DATA_DIR)/service + install -dm 755 $(DESTDIR)$(DATA_DIR)/services + install -m 644 packaging/services/engine-service.xml.in $(DESTDIR)$(DATA_DIR)/service + install -m 644 packaging/services/engine-service-logging.properties.in $(DESTDIR)$(DATA_DIR)/service + install -m 755 packaging/services/engine-service.py $(DESTDIR)$(DATA_DIR)/service diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index fa76816..5d4686d 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -355,13 +355,13 @@ # Install the systemd files: %if %{install_systemd} install -dm 755 %{buildroot}%{_unitdir} -install -m 644 packaging/fedora/engine-service.systemd %{buildroot}%{_unitdir}/%{engine_name}.service +install -m 644 packaging/services/engine-service.systemd %{buildroot}%{_unitdir}/%{engine_name}.service %endif # Install System V init scripts: %if %{install_systemv} install -dm 755 %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m 755 packaging/fedora/engine-service.sysv %{buildroot}%{_sysconfdir}/rc.d/init.d/ovirt-engine +install -m 755 packaging/services/engine-service.sysv %{buildroot}%{_sysconfdir}/rc.d/init.d/ovirt-engine %endif # backward compatibly (pre-3.3.0) diff --git a/packaging/fedora/engine-service-logging.properties.in b/packaging/services/engine-service-logging.properties.in similarity index 100% rename from packaging/fedora/engine-service-logging.properties.in rename to packaging/services/engine-service-logging.properties.in diff --git a/packaging/fedora/engine-service.py.in b/packaging/services/engine-service.py.in similarity index 99% rename from packaging/fedora/engine-service.py.in rename to packaging/services/engine-service.py.in index e450ad1..d4aa6dc 100644 --- a/packaging/fedora/engine-service.py.in +++ b/packaging/services/engine-service.py.in @@ -415,7 +415,7 @@ self._check( os.path.join( self._config.getString('ENGINE_USR'), - 'service', + 'services', ), directory=True, ) @@ -695,7 +695,7 @@ jbossBootLoggingFile = self._processTemplate( os.path.join( self._config.getString('ENGINE_USR'), - 'service', + 'services', 'engine-service-logging.properties.in' ), ) @@ -703,7 +703,7 @@ jbossConfigFile = self._processTemplate( os.path.join( self._config.getString('ENGINE_USR'), - 'service', + 'services', 'engine-service.xml.in', ), ) diff --git a/packaging/fedora/engine-service.systemd.in b/packaging/services/engine-service.systemd.in similarity index 100% rename from packaging/fedora/engine-service.systemd.in rename to packaging/services/engine-service.systemd.in diff --git a/packaging/fedora/engine-service.sysv.in b/packaging/services/engine-service.sysv.in similarity index 100% rename from packaging/fedora/engine-service.sysv.in rename to packaging/services/engine-service.sysv.in diff --git a/packaging/fedora/engine-service.xml.in b/packaging/services/engine-service.xml.in similarity index 100% rename from packaging/fedora/engine-service.xml.in rename to packaging/services/engine-service.xml.in -- To view, visit http://gerrit.ovirt.org/14151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38c2653509795ae04c190c4a84f00f53410fa983 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
