BBlack has submitted this change and it was merged.

Change subject: Switch on ECDSA Unified for primaries + parsoid
......................................................................


Switch on ECDSA Unified for primaries + parsoid

Change-Id: I95b3f40872c1a22c05106eb58acf77cc3964e38d
---
M modules/role/manifests/cache/ssl/parsoid.pp
M modules/role/manifests/cache/ssl/unified.pp
2 files changed, 2 insertions(+), 9 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/ssl/parsoid.pp 
b/modules/role/manifests/cache/ssl/parsoid.pp
index 997c7a4..3092a86 100644
--- a/modules/role/manifests/cache/ssl/parsoid.pp
+++ b/modules/role/manifests/cache/ssl/parsoid.pp
@@ -1,6 +1,6 @@
 class role::cache::ssl::parsoid {
     role::cache::ssl::local { 'unified':
-        certs          => ['uni.wikimedia.org'],
+        certs          => ['ecc-uni.wikimedia.org', 'uni.wikimedia.org'],
         default_server => true,
         do_ocsp        => true,
     }
diff --git a/modules/role/manifests/cache/ssl/unified.pp 
b/modules/role/manifests/cache/ssl/unified.pp
index d539c78..1bdcb42 100644
--- a/modules/role/manifests/cache/ssl/unified.pp
+++ b/modules/role/manifests/cache/ssl/unified.pp
@@ -1,13 +1,6 @@
 class role::cache::ssl::unified {
-
-    if $::hostname == 'cp1008' {
-        $certs = ['ecc-uni.wikimedia.org', 'uni.wikimedia.org']
-    } else {
-        $certs = ['uni.wikimedia.org']
-    }
-
     role::cache::ssl::local { 'unified':
-        certs          => $certs,
+        certs          => ['ecc-uni.wikimedia.org', 'uni.wikimedia.org'],
         default_server => true,
         do_ocsp        => true,
     }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95b3f40872c1a22c05106eb58acf77cc3964e38d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>

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

Reply via email to