Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: upgrade apache configuration ......................................................................
packaging: setup: upgrade apache configuration Added automatic apache configuration when upgrading from legacy setup. Change-Id: I12a3ae477f08dd004b4f128951fdedbb80006b20 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/apache/root.py M packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/15977/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/apache/root.py b/packaging/setup/plugins/ovirt-engine-setup/apache/root.py index 5e2d0b9..5bb2c7b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/apache/root.py +++ b/packaging/setup/plugins/ovirt-engine-setup/apache/root.py @@ -78,6 +78,11 @@ condition=lambda self: self._enabled, ) def _customization(self): + if self.environment[osetupcons.CoreEnv.UPGRADE_FROM_LEGACY]: + self.environment[ + osetupcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION + ] = True + if self.environment[ osetupcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION ] is None: diff --git a/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py b/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py index 7fd7527..c6a26cb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py @@ -33,6 +33,7 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import dialog +from ovirt_engine_setup import util as osetuputil @util.export @@ -126,6 +127,16 @@ ], ) def _customization(self): + if self.environment[osetupcons.CoreEnv.UPGRADE_FROM_LEGACY]: + #This is what we do also in legacy engine-upgrade. + config = osetuputil.ConfigFile([ + osetupcons.FileLocations.OVIRT_ENGINE_SERVICE_CONFIG + ]) + if not config.getboolean('ENGINE_PROXY_ENABLED'): + self.environment[ + osetupcons.ApacheEnv.CONFIGURE_SSL + ] = True + if self.environment[ osetupcons.ApacheEnv.CONFIGURE_SSL ] is None: -- To view, visit http://gerrit.ovirt.org/15977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12a3ae477f08dd004b4f128951fdedbb80006b20 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
