BBlack has submitted this change and it was merged.
Change subject: Switch r::c::ssl::sni to new certs
......................................................................
Switch r::c::ssl::sni to new certs
Change-Id: Ice9bf1b4f33e45c2df61a8999136a0e3538f25d7
---
M manifests/role/cache.pp
1 file changed, 24 insertions(+), 22 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 404085f..734b101 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -580,28 +580,6 @@
default_server => true,
}
- define sni_star() {
- localssl { $name:
- certname => "star.${name}",
- server_name => $name,
- server_aliases => ["*.${name}"],
- }
- }
-
- sni_star {
- 'wikipedia.org':;
- 'wiktionary.org':;
- 'wikiquote.org':;
- 'wikibooks.org':;
- 'wikisource.org':;
- 'wikinews.org':;
- 'wikiversity.org':;
- 'wikidata.org':;
- 'wikivoyage.org':;
- 'wikimediafoundation.org':;
- 'mediawiki.org':;
- }
-
define sni_cert() {
localssl { $name:
certname => "sni.${name}",
@@ -611,7 +589,31 @@
}
sni_cert {
+ 'zero.wikipedia.org':;
+ 'm.wikipedia.org':;
+ 'wikipedia.org':;
+ 'm.wikimedia.org':;
'wikimedia.org':;
+ 'm.wiktionary.org':;
+ 'wiktionary.org':;
+ 'm.wikiquote.org':;
+ 'wikiquote.org':;
+ 'm.wikibooks.org':;
+ 'wikibooks.org':;
+ 'm.wikisource.org':;
+ 'wikisource.org':;
+ 'm.wikinews.org':;
+ 'wikinews.org':;
+ 'm.wikiversity.org':;
+ 'wikiversity.org':;
+ 'm.wikidata.org':;
+ 'wikidata.org':;
+ 'm.wikivoyage.org':;
+ 'wikivoyage.org':;
+ 'm.wikimediafoundation.org':;
+ 'wikimediafoundation.org':;
+ 'm.mediawiki.org':;
+ 'mediawiki.org':;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/175041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice9bf1b4f33e45c2df61a8999136a0e3538f25d7
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
