Mark Bergsma has submitted this change and it was merged.
Change subject: Add role::cache::ssl::wikimedia, factor out common resources
......................................................................
Add role::cache::ssl::wikimedia, factor out common resources
Change-Id: I33d96d0b144eceee89e9c5b50f8769b69425dd10
---
M manifests/role/cache.pp
1 file changed, 14 insertions(+), 6 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 405d34a..7675541 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -786,8 +786,8 @@
include misc::monitoring::htcp-loss
}
}
-
- class ssl::unified {
+
+ class ssl($sitename, $certname) {
include certificates::wmf_ca, role::protoproxy::ssl::common
# Assumes that LVS service IPs are setup elsewhere
@@ -798,17 +798,25 @@
check_command => "check_ssl_cert!*.wikimedia.org",
}
- install_certificate { 'unified.wikimedia.org':
- before => Protoproxy::Localssl['unified']
+ install_certificate { $certname:
+ before => Protoproxy::Localssl[$sitename]
}
- protoproxy::localssl { 'unified':
- proxy_server_cert_name => 'unified.wikimedia.org',
+ protoproxy::localssl { $sitename:
+ proxy_server_cert_name => $certname,
upstream_port => '80',
enabled => true
}
}
+ class ssl::wikimedia {
+ class{ '::role::cache::ssl': sitename => 'wikimedia', certname
=> 'star.wikimedia.org' }
+ }
+
+ class ssl::unified {
+ class{ '::role::cache::ssl': sitename => 'unified', certname =>
'unified.wikimedia.org' }
+ }
+
class text {
include lvs::configuration
--
To view, visit https://gerrit.wikimedia.org/r/79570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33d96d0b144eceee89e9c5b50f8769b69425dd10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
