Dzahn has submitted this change and it was merged.
Change subject: protoproxy - update usage examples to current
......................................................................
protoproxy - update usage examples to current
update the usage examples to the current situation
with eqiad and esams vs. pmtpa. clean remnants
and at the same time show how it to use it with
multiple backends and proxy server names.
Change-Id: I9d1c4fc279b587a50ecc3dcaff3bce29b175fd8b
---
M modules/protoproxy/manifests/init.pp
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/protoproxy/manifests/init.pp
b/modules/protoproxy/manifests/init.pp
index 8471a07..bf8d761 100644
--- a/modules/protoproxy/manifests/init.pp
+++ b/modules/protoproxy/manifests/init.pp
@@ -38,16 +38,18 @@
#
# === Example:
#
-# protoproxy{ 'bits.wikimedia.org':
+# protoproxy{ 'bits':
# proxy_addresses => {
-# 'pmtpa' => [ '192.0.2.1' ],
+# 'eqiad' => [ '208.80.154.234', '[2620:0:861:ed1a::1:a]' ],
+# 'esams' => [ '91.198.174.202', '[2620:0:862:ed1a::1:a]' ],
# },
-# proxy_server_name => 'bits.wikimedia.org',
+# proxy_server_name => 'bits.wikimedia.org geoiplookup.wikimedia.org',
# proxy_server_cert_name => 'unified.wikimedia.org',
# proxy_backend => {
-# 'pmtpa' => {'primary' => 'apaches.wmnet' },
+# 'eqiad' => { 'primary' => '10.2.2.23' },
+# 'esams' => { 'primary' => '10.2.3.23', 'secondary' => '208.80.154.234'
},
# },
-# ipv6_enabled => false
+# ipv6_enabled => true,
# }
#
define protoproxy(
--
To view, visit https://gerrit.wikimedia.org/r/173350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d1c4fc279b587a50ecc3dcaff3bce29b175fd8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
