BBlack has submitted this change and it was merged.
Change subject: cache_(text|upload): frontend default_ttl => 30d
......................................................................
cache_(text|upload): frontend default_ttl => 30d
Bug: T108612
Change-Id: I1b57d0d69fe3d132be9aa82515ebc15f92a31cc4
---
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
2 files changed, 20 insertions(+), 18 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 6e62880..cb62b95 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -121,13 +121,14 @@
}
varnish::instance { 'text-frontend':
- name => 'frontend',
- vcl => 'text-frontend',
- extra_vcl => ['text-common'],
- port => 80,
- admin_port => 6082,
- storage => "-s malloc,${memory_storage_size}G",
- directors => {
+ name => 'frontend',
+ vcl => 'text-frontend',
+ extra_vcl => ['text-common'],
+ port => 80,
+ admin_port => 6082,
+ runtime_parameters => ['default_ttl=2592000'],
+ storage => "-s malloc,${memory_storage_size}G",
+ directors => {
'backend' => {
'dynamic' => 'yes',
'type' => 'chash',
@@ -140,7 +141,7 @@
'service' => 'varnish-be-rand',
},
},
- vcl_config => {
+ vcl_config => {
'retry503' => 1,
'cache4xx' => '1m',
'purge_host_regex' =>
$::role::cache::base::purge_host_not_upload_re,
@@ -156,7 +157,7 @@
'probe' => 'varnish',
},
]),
- cluster_options => {
+ cluster_options => {
'bits_domain' => $bits_domain,
'top_domain' => $top_domain,
'enable_geoiplookup' => true,
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 3c9f3ef..ea0816d 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -95,25 +95,26 @@
}
varnish::instance { 'upload-frontend':
- name => 'frontend',
- vcl => 'upload-frontend',
- port => 80,
- admin_port => 6082,
- storage => "-s malloc,${memory_storage_size}G",
- directors => {
+ name => 'frontend',
+ vcl => 'upload-frontend',
+ port => 80,
+ admin_port => 6082,
+ runtime_parameters => ['default_ttl=2592000'],
+ storage => "-s malloc,${memory_storage_size}G",
+ directors => {
'backend' => {
'dynamic' => 'yes',
'type' => 'chash',
'backends' => $site_upload_nodes,
},
},
- vcl_config => {
+ vcl_config => {
'retry503' => 1,
'cache4xx' => '1m',
'purge_host_regex' =>
$::role::cache::base::purge_host_only_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',
@@ -123,7 +124,7 @@
'probe' => 'varnish',
},
]),
- cluster_options => $cluster_options,
+ cluster_options => $cluster_options,
}
include role::cache::logging
--
To view, visit https://gerrit.wikimedia.org/r/230808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b57d0d69fe3d132be9aa82515ebc15f92a31cc4
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
