Mark Bergsma has submitted this change and it was merged.
Change subject: Use port 3128 for newer mobile backend Varnish servers
......................................................................
Use port 3128 for newer mobile backend Varnish servers
Change-Id: I6bcc1dfb902c8bcdfded22f062a24dbbd422332d
---
M manifests/role/cache.pp
1 file changed, 13 insertions(+), 5 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 146638f..30b18dc 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -861,8 +861,11 @@
varnish::instance { "mobile-backend":
name => "",
vcl => "mobile-backend",
- # FIXME: set to 3128 on new servers
- port => 81,
+ # TODO: remove after migration
+ port => $::hostname ? {
+ /^cp104[1-4]$/ => 81,
+ default => 3128,
+ },
admin_port => 6083,
storage => $::realm ? {
'production' => "-s
main1=persistent,/srv/sda3/varnish.main1,${storage_size_main}G -s
main2=persistent,/srv/sdb3/varnish.main2,${storage_size_main}G",
@@ -916,15 +919,20 @@
'purge_regex' =>
'^http://(?!upload\.wikimedia\.org)',
'layer' => 'frontend',
},
- backend_options => {
- # FIXME: set to 3128 for new servers
+ backend_options => [
+ # TODO: remove after migration
+ {
+ 'backend_match' => '^cp104[1-4]\.',
'port' => 81,
+ },
+ {
+ 'port' => 3128,
'connect_timeout' => "5s",
'first_byte_timeout' => "35s",
'between_bytes_timeout' => "2s",
'max_connections' => 100000,
'probe' => "varnish",
- },
+ }],
xff_sources => $network::constants::all_networks,
}
--
To view, visit https://gerrit.wikimedia.org/r/70148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bcc1dfb902c8bcdfded22f062a24dbbd422332d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
