Mark Bergsma has submitted this change and it was merged.
Change subject: Rename role::cache::ssl::text to ssl::unified
......................................................................
Rename role::cache::ssl::text to ssl::unified
Change-Id: Idfa43a385f14f635dd3b804650121adcaf71e9a3
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 3 insertions(+), 3 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 a5a0682..6747b5d 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -776,7 +776,7 @@
}
}
- class ssl::text {
+ class ssl::unified {
include certificates::wmf_ca, role::protoproxy::ssl::common
# Assumes that LVS service IPs are setup elsewhere
@@ -789,7 +789,7 @@
install_certificate { 'unified.wikimedia.org': }
- protoproxy::localssl { 'text':
+ protoproxy::localssl { 'unified':
proxy_server_cert_name => 'unified.wikimedia.org',
upstream_port => '80',
enabled => true
diff --git a/manifests/site.pp b/manifests/site.pp
index 5bf2b7f..88b2ff5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -122,7 +122,7 @@
# amssq47 is a text varnish
node /^amssq47\.esams\.wikimedia\.org$/ {
- include role::cache::text, role::cache::ssl::text
+ include role::cache::text, role::cache::ssl::unified
interface::add_ip6_mapped { "main": }
}
--
To view, visit https://gerrit.wikimedia.org/r/78224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfa43a385f14f635dd3b804650121adcaf71e9a3
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
