Juan Hernandez has uploaded a new change for review. Change subject: packaging: Use configuration to generate paths ......................................................................
packaging: Use configuration to generate paths The service start/stop script still had some paths hardcoded, ignoring the values of the ENGINE_* settings in /etc/ovirt-engine/engine.conf.defaults and /etc/sysconfig/ovir-engine files. This affected mostly the location of the log files. This patch fixes that. Change-Id: I0c4aa730c7b58983f27c6e2f02701a34911f41ee Signed-off-by: Juan Hernandez <[email protected]> --- M Makefile M backend/manager/conf/engine.conf.defaults R packaging/fedora/engine-service-logging.properties.in M packaging/fedora/engine-service.py M packaging/fedora/engine-service.xml.in 5 files changed, 37 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/8297/1 diff --git a/Makefile b/Makefile index 1fd8749..2fe900a 100644 --- a/Makefile +++ b/Makefile @@ -376,7 +376,7 @@ # 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 $(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 -m 644 packaging/fedora/engine-service.sysconfig $(DESTDIR)$(SYSCONF_DIR)/sysconfig/ovirt-engine install -m 644 packaging/fedora/engine-service.limits $(DESTDIR)$(SYSCONF_DIR)/security/limits.d/10-$(ENGINE_NAME).conf diff --git a/backend/manager/conf/engine.conf.defaults b/backend/manager/conf/engine.conf.defaults index 6e75dca..2fe1db0 100644 --- a/backend/manager/conf/engine.conf.defaults +++ b/backend/manager/conf/engine.conf.defaults @@ -20,6 +20,7 @@ # Important directories used by the engine: # ENGINE_ETC=/etc/ovirt-engine +ENGINE_PKI=/etc/pki/ovirt-engine ENGINE_LOG=/var/log/ovirt-engine ENGINE_TMP=/var/tmp/ovirt-engine ENGINE_USR=/usr/share/ovirt-engine diff --git a/packaging/fedora/engine-service-logging.properties b/packaging/fedora/engine-service-logging.properties.in similarity index 86% rename from packaging/fedora/engine-service-logging.properties rename to packaging/fedora/engine-service-logging.properties.in index 5410893..754c097 100644 --- a/packaging/fedora/engine-service-logging.properties +++ b/packaging/fedora/engine-service-logging.properties.in @@ -5,7 +5,7 @@ handler.FILE.level=DEBUG handler.FILE.properties=autoFlush,fileName handler.FILE.autoFlush=true -handler.FILE.fileName=/var/log/ovirt-engine/boot.log +handler.FILE.fileName=$getString('ENGINE_LOG')/boot.log handler.FILE.formatter=PATTERN formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter diff --git a/packaging/fedora/engine-service.py b/packaging/fedora/engine-service.py index 3f37856..5bf3b7d 100644 --- a/packaging/fedora/engine-service.py +++ b/packaging/fedora/engine-service.py @@ -63,6 +63,8 @@ # JBoss files: jbossModulesJar = None +jbossBootLoggingTemplateFile = None +jbossBootLoggingFile = None # Engine directories: engineEtcDir = None @@ -76,11 +78,9 @@ # Engine files: enginePidFile = None -engineLoggingFile = None engineConfigTemplateFile = None engineConfigFile = None engineLogFile = None -engineBootLogFile = None engineConsoleLogFile = None engineServerLogFile = None @@ -162,14 +162,6 @@ global javaLauncher javaLauncher = os.path.join(javaHomeDir, "bin/java") - # JBoss directories: - global jbossHomeDir - jbossHomeDir = engineConfig.getString("JBOSS_HOME") - - # JBoss files: - global jbossModulesJar - jbossModulesJar = os.path.join(jbossHomeDir, "jboss-modules.jar") - # Engine directories: global engineEtcDir global engineLogDir @@ -194,21 +186,29 @@ # Engine files: global enginePidFile - global engineLoggingFile global engineLogFile - global jbossConfigTemplateFile - global jbossConfigFile - global engineBootLogFile global engineConsoleLogFile global engineServerLogFile enginePidFile = engineConfig.getString("ENGINE_PID") - engineLoggingFile = os.path.join(engineServiceDir, "engine-service-logging.properties") engineLogFile = os.path.join(engineLogDir, "engine.log") - jbossConfigTemplateFile = os.path.join(engineServiceDir, "engine-service.xml.in") - jbossConfigFile = os.path.join(engineTmpDir, "engine-service.xml") - engineBootLogFile = os.path.join(engineLogDir, "boot.log") engineConsoleLogFile = os.path.join(engineLogDir, "console.log") engineServerLogFile = os.path.join(engineLogDir, "server.log") + + # JBoss directories: + global jbossHomeDir + jbossHomeDir = engineConfig.getString("JBOSS_HOME") + + # JBoss files: + global jbossModulesJar + global jbossBootLoggingTemplateFile + global jbossBootLoggingFile + global jbossConfigTemplateFile + global jbossConfigFile + jbossModulesJar = os.path.join(jbossHomeDir, "jboss-modules.jar") + jbossBootLoggingTemplateFile = os.path.join(engineServiceDir, "engine-service-logging.properties.in") + jbossBootLoggingFile = os.path.join(engineTmpDir, "engine-service-logging.properties") + jbossConfigTemplateFile = os.path.join(engineServiceDir, "engine-service.xml.in") + jbossConfigFile = os.path.join(engineTmpDir, "engine-service.xml") def checkIdentity(): @@ -276,12 +276,11 @@ checkDirectory(engineServiceDir, uid=0, gid=0) checkDirectory(engineContentDir, uid=engineUid, gid=engineGid) checkDirectory(engineDeploymentsDir, uid=engineUid, gid=engineGid) - checkFile(engineLoggingFile) + checkFile(jbossBootLoggingTemplateFile) checkFile(jbossConfigTemplateFile) # Check that log files are owned by the engine user, if they exist: checkLog(engineLogFile) - checkLog(engineBootLogFile) checkLog(engineConsoleLogFile) checkLog(engineServerLogFile) @@ -380,9 +379,16 @@ os.mkdir(engineCacheDir) os.chown(engineCacheDir, engineUid, engineGid) + # Create the boot logging file from the template: + jbossBootLoggingTemplate = Template(file=jbossBootLoggingTemplateFile, searchList=[engineConfig]) + jbossBootLoggingText = str(jbossBootLoggingTemplate) + with open(jbossBootLoggingFile, "w") as jbossBootLoggingFd: + jbossBootLoggingFd.write(jbossBootLoggingText) + os.chown(jbossBootLoggingFile, engineUid, engineGid) + # Generate the main configuration from the template and copy it to the - # configuration directory making sure that the application server will be - # able to write to it: + # configuration temporary directory making sure that the application server + # will be able to write to it: jbossConfigTemplate = Template(file=jbossConfigTemplateFile, searchList=[engineConfig]) jbossConfigText = str(jbossConfigTemplate) with open(jbossConfigFile, "w") as jbossConfigFd: @@ -448,7 +454,7 @@ # Add arguments for JBoss: engineArgs.extend([ "-Djava.util.logging.manager=org.jboss.logmanager", - "-Dlogging.configuration=file://%s" % engineLoggingFile, + "-Dlogging.configuration=file://%s" % jbossBootLoggingFile, "-Dorg.jboss.resolver.warning=true", "-Djboss.modules.system.pkgs=org.jboss.byteman", "-Djboss.server.default.config=engine-service", diff --git a/packaging/fedora/engine-service.xml.in b/packaging/fedora/engine-service.xml.in index 9980ff4..a253460 100644 --- a/packaging/fedora/engine-service.xml.in +++ b/packaging/fedora/engine-service.xml.in @@ -27,7 +27,7 @@ <formatter> <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/> </formatter> - <file path="/var/log/ovirt-engine/server.log"/> + <file path="$getString('ENGINE_LOG')/server.log"/> <rotate-size value="10M"/> <max-backup-index value="30"/> <append value="true"/> @@ -39,7 +39,7 @@ <formatter> <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/> </formatter> - <file path="/var/log/ovirt-engine/engine.log"/> + <file path="$getString('ENGINE_LOG')/engine.log"/> <rotate-size value="10M"/> <max-backup-index value="30"/> <append value="true"/> @@ -115,7 +115,7 @@ </subsystem> <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1"> - <deployment-scanner scan-interval="5000" path="/var/lib/ovirt-engine/deployments"/> + <deployment-scanner scan-interval="5000" path="$getString('ENGINE_VAR')/deployments"/> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> @@ -143,7 +143,7 @@ </caches> <async thread-pool-name="default"/> <timer-service thread-pool-name="default"> - <data-store path="/var/lib/ovirt-engine/timer-service-data"/> + <data-store path="$getString('ENGINE_VAR')/timer-service-data"/> </timer-service> <remote connector-ref="remoting-connector" thread-pool-name="default"/> <thread-pools> @@ -244,7 +244,7 @@ #end if #if $getBoolean('ENGINE_HTTPS_ENABLED') <connector name="https" protocol="HTTP/1.1" scheme="https" socket-binding="https" secure="true"> - <ssl name="ssl" password="mypass" certificate-key-file="/etc/pki/ovirt-engine/keys/apache.p12" keystore-type="PKCS12" key-alias="1" protocol="TLSv1" verify-client="false"/> + <ssl name="ssl" password="mypass" certificate-key-file="$getString('ENGINE_PKI')/keys/apache.p12" keystore-type="PKCS12" key-alias="1" protocol="TLSv1" verify-client="false"/> </connector> #end if #if $getBoolean('ENGINE_AJP_ENABLED') -- To view, visit http://gerrit.ovirt.org/8297 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c4aa730c7b58983f27c6e2f02701a34911f41ee Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
