Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/110066

Change subject: wikitech: Add intermediate certificates to chain
......................................................................

wikitech: Add intermediate certificates to chain

Change-Id: I4c70c3be53b22ef8bc44a2a825859c54a87d951b
---
M manifests/role/nova.pp
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/110066/1

diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index a23da38..e6277da 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -227,17 +227,20 @@
        case $::realm {
                'labs': {
                        $certificate = 'star.wmflabs'
+                       $ca = ''
                }
                'production': {
                        $certificate = 'wikitech.wikimedia.org'
-                       $ca_name = 'RapidSSL_CA.pem'
+                       $ca = 'RapidSSL_CA.pem GeoTrust_Global_CA.pem'
                }
                'default': {
                        fail('unknown realm, should be labs or production')
                }
        }
 
-       install_certificate{ $certificate: }
+       install_certificate { $certificate:
+               ca => $ca
+       }
 
        class { "openstack::openstack-manager":
                openstack_version => $openstack_version,

-- 
To view, visit https://gerrit.wikimedia.org/r/110066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c70c3be53b22ef8bc44a2a825859c54a87d951b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to