Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: update httpd conf on engine-upgrade ......................................................................
packaging: update httpd conf on engine-upgrade Update /etc/httpd/conf.d/ovirt-engine.conf if it exists. It will configure mod_deflate also on upgrade and not only on install. Change-Id: I73175ef2acc9cf88261eb7df4f17602085151b1c Bug-Url: https://bugzilla.redhat.com/948783 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/fedora/setup/engine-upgrade.py 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/13741/1 diff --git a/packaging/fedora/setup/engine-upgrade.py b/packaging/fedora/setup/engine-upgrade.py index 2b29b6c..e89bacc 100755 --- a/packaging/fedora/setup/engine-upgrade.py +++ b/packaging/fedora/setup/engine-upgrade.py @@ -1062,6 +1062,20 @@ ) +def updateHttpdConf(): + """ + update httpd configuration if it's used by the existing setup. + """ + if os.path.exists(basedefs.FILE_OVIRT_HTTPD_CONF): + utils.processTemplate( + basedefs.FILE_OVIRT_HTTPD_CONF_TEMPLATE, + basedefs.FILE_OVIRT_HTTPD_CONF, + { + '@JBOSS_AJP_PORT@': basedefs.JBOSS_AJP_PORT, + } + ) + + def main(options): # BEGIN: PROCESS-INITIALIZATION miniyumsink = utils.MiniYumSink() @@ -1104,7 +1118,9 @@ stopEngineService = [stopEngine] startEngineService = [startEngine] preupgradeFunc = [preupgradeUUIDCheck] - upgradeFunc = [rhyum.update, generateEngineConf, setupVarPrivileges] + upgradeFunc = [rhyum.update, generateEngineConf, setupVarPrivileges, + updateHttpdConf, + ] postFunc = [modifyUUIDs, ca.commit, runPost, deleteEngineSysconfig] engineService = basedefs.ENGINE_SERVICE_NAME # define db connections services -- To view, visit http://gerrit.ovirt.org/13741 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73175ef2acc9cf88261eb7df4f17602085151b1c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
