[Engine-patches] Change in ovirt-engine[master]: packaging: setup: fix ssl configuration

[sbonazzo]

Sandro Bonazzola has uploaded a new change for review.

Change subject: packaging: setup: fix ssl configuration
......................................................................

packaging: setup: fix ssl configuration

Fixed ssl configuration using SSLCACertificateFile
instead of SSLCertificateChainFile.

Change-Id: I8a0c88915c552fd60cc193c89fb4f52104ba8c44
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/setup/engine-upgrade.py
2 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/15837/1

diff --git a/packaging/fedora/setup/engine-setup.py 
b/packaging/fedora/setup/engine-setup.py
index 3e68960..fdbaa98 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -760,7 +760,7 @@
         handler.open()
         handler.editParam("SSLCertificateFile", basedefs.FILE_APACHE_CERT, 
uncomment=True)
         handler.editParam("SSLCertificateKeyFile", 
basedefs.FILE_APACHE_PRIVATE_KEY, uncomment=True)
-        handler.editParam("SSLCertificateChainFile", 
basedefs.FILE_APACHE_CA_CRT_SRC, uncomment=True)
+        handler.editParam('SSLCACertificateFile', 
basedefs.FILE_APACHE_CA_CRT_SRC, uncomment=True)
         handler.close()
     except:
         logging.error(traceback.format_exc())
diff --git a/packaging/fedora/setup/engine-upgrade.py 
b/packaging/fedora/setup/engine-upgrade.py
index 95075c1..04aaa94 100755
--- a/packaging/fedora/setup/engine-upgrade.py
+++ b/packaging/fedora/setup/engine-upgrade.py
@@ -577,7 +577,14 @@
             handler.editParam("SSLCertificateKeyFile", 
basedefs.FILE_APACHE_PRIVATE_KEY)
 
         if handler.getParam("SSLCertificateChainFile") == 
'/etc/pki/ovirt-engine/ca.pem':
-            handler.editParam("SSLCertificateChainFile", 
basedefs.FILE_APACHE_CA_CRT_SRC)
+            handler.renameParam(
+                'SSLCertificateChainFile',
+                'SSLCACertificateFile'
+            )
+            handler.editParam(
+                'SSLCACertificateFile',
+                basedefs.FILE_APACHE_CA_CRT_SRC
+            )
         handler.close()
 
     def commit(self):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a0c88915c552fd60cc193c89fb4f52104ba8c44
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches