Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: service: rename engine service file to match service name ......................................................................
packaging: service: rename engine service file to match service name Always install sysv and systemd, this makes the packaging directory consistent with the naming scheme and the outcome on filesystem after installation. Change-Id: I2f10ef8329dd8f2f872f7c6dfebd01f73b151a0c Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M packaging/fedora/spec/ovirt-engine.spec.in R packaging/services/ovirt-engine-logging.properties.in R packaging/services/ovirt-engine.py R packaging/services/ovirt-engine.systemd.in R packaging/services/ovirt-engine.sysv.in R packaging/services/ovirt-engine.xml.in 7 files changed, 18 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/14239/1 diff --git a/Makefile b/Makefile index 03a3b68..3a50ecd 100644 --- a/Makefile +++ b/Makefile @@ -133,8 +133,8 @@ backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml \ backend/manager/tools/src/main/conf/engine-notifier-log4j.xml \ packaging/services/config.py \ - packaging/services/engine-service.systemd \ - packaging/services/engine-service.sysv \ + packaging/services/ovirt-engine.systemd \ + packaging/services/ovirt-engine.sysv \ packaging/fedora/spec/ovirt-engine.spec \ $(NULL) @@ -144,7 +144,7 @@ $(NULL) generated-files: $(GENERATED) - chmod a+x packaging/services/engine-service.sysv + chmod a+x packaging/services/ovirt-engine.sysv $(BUILD_FILE): -[ "$(MAVEN_OUTPUT_DIR_DEFAULT)" = "$(MAVEN_OUTPUT_DIR)" ] && rm -fr "$(MAVEN_OUTPUT_DIR)" @@ -425,6 +425,8 @@ install -m 644 packaging/services/__init__.py $(DESTDIR)$(DATA_DIR)/services install -m 644 packaging/services/config.py $(DESTDIR)$(DATA_DIR)/services install -m 644 packaging/services/service.py $(DESTDIR)$(DATA_DIR)/services - install -m 644 packaging/services/engine-service.xml.in $(DESTDIR)$(DATA_DIR)/services - install -m 644 packaging/services/engine-service-logging.properties.in $(DESTDIR)$(DATA_DIR)/services - install -m 755 packaging/services/engine-service.py $(DESTDIR)$(DATA_DIR)/services + install -m 644 packaging/services/ovirt-engine.xml.in $(DESTDIR)$(DATA_DIR)/services + install -m 644 packaging/services/ovirt-engine-logging.properties.in $(DESTDIR)$(DATA_DIR)/services + install -m 755 packaging/services/ovirt-engine.py $(DESTDIR)$(DATA_DIR)/services + install -m 755 packaging/services/ovirt-engine.systemd $(DESTDIR)$(DATA_DIR)/services + install -m 755 packaging/services/ovirt-engine.sysv $(DESTDIR)$(DATA_DIR)/services diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 13788c3..aabbd8c 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -372,14 +372,14 @@ # Install the systemd files: %if %{install_systemd} -install -dm 755 %{buildroot}%{_unitdir} -install -m 644 packaging/services/engine-service.systemd %{buildroot}%{_unitdir}/%{engine_name}.service +install -dm 755 "%{buildroot}%{_unitdir}" +cp "%{buildroot}%{engine_data}/services/ovirt-engine.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/services/engine-service.sysv %{buildroot}%{_sysconfdir}/rc.d/init.d/ovirt-engine +install -dm 755 "%{buildroot}%{_sysconfdir}/rc.d/init.d" +cp "%{buildroot}%{engine_data}/services/ovirt-engine.sysv" "%{buildroot}%{_sysconfdir}/rc.d/init.d/ovirt-engine" %endif # backward compatibly (pre-3.3.0) diff --git a/packaging/services/engine-service-logging.properties.in b/packaging/services/ovirt-engine-logging.properties.in similarity index 100% rename from packaging/services/engine-service-logging.properties.in rename to packaging/services/ovirt-engine-logging.properties.in diff --git a/packaging/services/engine-service.py b/packaging/services/ovirt-engine.py similarity index 98% rename from packaging/services/engine-service.py rename to packaging/services/ovirt-engine.py index 5d656f8..1a5048f 100755 --- a/packaging/services/engine-service.py +++ b/packaging/services/ovirt-engine.py @@ -276,7 +276,7 @@ template=os.path.join( self._config.getString('ENGINE_USR'), 'services', - 'engine-service-logging.properties.in' + 'ovirt-engine-logging.properties.in' ), dir=self._config.getString('ENGINE_TMP'), ) @@ -285,7 +285,7 @@ template=os.path.join( self._config.getString('ENGINE_USR'), 'services', - 'engine-service.xml.in', + 'ovirt-engine.xml.in', ), dir=self._config.getString('ENGINE_TMP'), ) @@ -305,7 +305,7 @@ # Add arguments for the java virtual machine: self._engineArgs.extend([ # The name or the process, as displayed by ps: - 'engine-service', + 'ovirt-engine', # Virtual machine options: '-server', @@ -356,7 +356,7 @@ '-Dorg.jboss.resolver.warning=true', '-Djboss.modules.system.pkgs=org.jboss.byteman', '-Djboss.modules.write-indexes=false', - '-Djboss.server.default.config=engine-service', + '-Djboss.server.default.config=ovirt-engine', '-Djboss.home.dir=%s' % self._config.getString( 'JBOSS_HOME' ), diff --git a/packaging/services/engine-service.systemd.in b/packaging/services/ovirt-engine.systemd.in similarity index 72% rename from packaging/services/engine-service.systemd.in rename to packaging/services/ovirt-engine.systemd.in index bbee6ff..73884d2 100644 --- a/packaging/services/engine-service.systemd.in +++ b/packaging/services/ovirt-engine.systemd.in @@ -7,7 +7,7 @@ User=@ENGINE_USER@ Group=@ENGINE_GROUP@ LimitNOFILE=65535 -ExecStart=/usr/share/ovirt-engine/services/engine-service.py $OVIRT_ENGINE_EXTRA_ARGS start +ExecStart=/usr/share/ovirt-engine/services/ovirt-engine.py $OVIRT_ENGINE_EXTRA_ARGS start EnvironmentFile=-/etc/sysconfig/ovirt-engine [Install] diff --git a/packaging/services/engine-service.sysv.in b/packaging/services/ovirt-engine.sysv.in similarity index 95% rename from packaging/services/engine-service.sysv.in rename to packaging/services/ovirt-engine.sysv.in index c52c7b8..0a74e38 100644 --- a/packaging/services/engine-service.sysv.in +++ b/packaging/services/ovirt-engine.sysv.in @@ -34,7 +34,7 @@ touch "${PIDFILE}" chown "${USER}" "${PIDFILE}" daemon --user "${USER}" --pidfile="${PIDFILE}" \ - /usr/share/ovirt-engine/services/engine-service.py \ + /usr/share/ovirt-engine/services/ovirt-engine.py \ --pidfile="${PIDFILE}" \ --background \ ${OVIRT_ENGINE_EXTRA_ARGS} \ diff --git a/packaging/services/engine-service.xml.in b/packaging/services/ovirt-engine.xml.in similarity index 100% rename from packaging/services/engine-service.xml.in rename to packaging/services/ovirt-engine.xml.in -- To view, visit http://gerrit.ovirt.org/14239 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f10ef8329dd8f2f872f7c6dfebd01f73b151a0c 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
