Sandro Bonazzola has uploaded a new change for review.

Change subject: packaging: setup: configure ssl upgrading from legacy
......................................................................

packaging: setup: configure ssl upgrading from legacy

set osetupcons.ApacheEnv.HTTPD_CONF_SSL when upgrading from
legacy.

Change-Id: I6dbd4f0ef23f3d0e8c845b3e0fc752696f72ec47
Signed-off-by: Sandro Bonazzola <[email protected]>
---
M packaging/setup/plugins/ovirt-engine-setup/legacy/config.py
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/16586/1

diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py 
b/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py
index 793a607..9d97d65 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py
@@ -74,6 +74,18 @@
         self.environment[osetupcons.ConfigEnv.FQDN] = config.get('ENGINE_FQDN')
         if not config.getboolean('ENGINE_PROXY_ENABLED'):
             self.environment[osetupcons.ApacheEnv.CONFIGURE_SSL] = True
+        else:
+            #if it's enabled it has been already done
+            self.environment[osetupcons.ApacheEnv.CONFIGURE_SSL] = False
+            for key in (
+                otopicons.CoreEnv.MODIFIED_FILES,
+                osetupcons.CoreEnv.UNINSTALL_UNREMOVABLE_FILES,
+            ):
+                self.environment[key].append(
+                    self.environment[
+                        osetupcons.ApacheEnv.HTTPD_CONF_SSL
+                    ]
+                )
 
     @plugin.event(
         stage=plugin.Stages.STAGE_MISC,


-- 
To view, visit http://gerrit.ovirt.org/16586
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dbd4f0ef23f3d0e8c845b3e0fc752696f72ec47
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

Reply via email to