BBlack has uploaded a new change for review.

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

Change subject: fix server_aliases for sni_star
......................................................................

fix server_aliases for sni_star

Change-Id: I2902e03f5f1942c09f3e86bdf373e05216577169
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/161358/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 68ed6eb..fecdc79 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -573,7 +573,7 @@
         }
     }
 
-    define localssl($certname, $default_server=false) {
+    define localssl($certname, $server_aliases=[], $default_server=false) {
         # Assumes that LVS service IPs are setup elsewhere
 
         # For unified or star certs we need to do a bit of
@@ -598,6 +598,7 @@
             proxy_server_cert_name => $certname,
             upstream_port          => '80',
             default_server         => $default_server,
+            server_aliases         => $server_aliases,
         }
     }
 
@@ -620,8 +621,8 @@
 
         define sni_star() {
             localssl { $name:
-                server_aliases => ["*.${name}"],
                 certname => "star.${name}",
+                server_aliases => ["*.${name}"],
             }
         }
 

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

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

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

Reply via email to