BBlack has submitted this change and it was merged.
Change subject: cache_mobile: def_ttl 30d
......................................................................
cache_mobile: def_ttl 30d
Bug: T108612
Change-Id: Ic28ff9c2d84313b43f48aa5d9bd6219d4b0be64f
---
M modules/role/manifests/cache/mobile.pp
1 file changed, 12 insertions(+), 16 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index f3db662..a6cdd2c 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -66,18 +66,13 @@
auth_content => secret('misc/zerofetcher.auth'),
}
- $runtime_param = $::site ? {
- # 'esams' => ["prefer_ipv6=on"],
- default => [],
- }
-
varnish::instance { 'mobile-backend':
name => '',
vcl => 'mobile-backend',
port => 3128,
admin_port => 6083,
storage => $::role::cache::2layer::persistent_storage_args,
- runtime_parameters => $runtime_param,
+ runtime_parameters => ['default_ttl=2592000'],
directors => $varnish_be_directors[$::site_tier],
vcl_config => {
'purge_host_regex' =>
$::role::cache::base::purge_host_not_upload_re,
@@ -105,25 +100,26 @@
}
varnish::instance { 'mobile-frontend':
- name => 'frontend',
- vcl => 'mobile-frontend',
- extra_vcl => ['zero'],
- port => 80,
- admin_port => 6082,
- storage => "-s malloc,${memory_storage_size}G",
- directors => {
+ name => 'frontend',
+ vcl => 'mobile-frontend',
+ extra_vcl => ['zero'],
+ port => 80,
+ admin_port => 6082,
+ storage => "-s malloc,${memory_storage_size}G",
+ runtime_parameters => ['default_ttl=2592000'],
+ directors => {
'backend' => {
'dynamic' => 'yes',
'type' => 'chash',
'backends' => $site_mobile_nodes,
},
},
- vcl_config => {
+ vcl_config => {
'retry503' => 1,
'purge_host_regex' =>
$::role::cache::base::purge_host_not_upload_re,
'layer' => 'frontend',
},
- backend_options =>
array_concat($::role::cache::2layer::backend_scaled_weights, [
+ backend_options =>
array_concat($::role::cache::2layer::backend_scaled_weights, [
{
'port' => 3128,
'connect_timeout' => '5s',
@@ -133,7 +129,7 @@
'probe' => 'varnish',
},
]),
- cluster_options => $cluster_options,
+ cluster_options => $cluster_options,
}
# varnish::logging to be removed once
--
To view, visit https://gerrit.wikimedia.org/r/230809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic28ff9c2d84313b43f48aa5d9bd6219d4b0be64f
Gerrit-PatchSet: 2
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
