BBlack has submitted this change and it was merged.
Change subject: fix server_name for star-cert stuff
......................................................................
fix server_name for star-cert stuff
Change-Id: Ieebef0eed46f611d5431396d44cf9722eba9d71d
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 49db432..edb6f7a 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -573,7 +573,7 @@
}
}
- define localssl($certname, $server_aliases=[], $default_server=false) {
+ define localssl($certname, $server_name=$::fqdn, $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_name => $server_name,
server_aliases => $server_aliases,
}
}
@@ -622,6 +623,7 @@
define sni_star() {
localssl { $name:
certname => "star.${name}",
+ server_name => $name,
server_aliases => ["*.${name}"],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/161389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieebef0eed46f611d5431396d44cf9722eba9d71d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
