BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/295577
Change subject: move r::c::base classparams down as appropriate ...................................................................... move r::c::base classparams down as appropriate These 5 are actually specific to text or upload at this time. Change-Id: Ibe5b7a46e707444b1f3a486569bf7c05a0740ec7 --- M hieradata/labs.yaml M modules/role/manifests/cache/base.pp M modules/role/manifests/cache/text.pp M modules/role/manifests/cache/upload.pp 4 files changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/295577/1 diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml index 9499dd9..7459e1f 100644 --- a/hieradata/labs.yaml +++ b/hieradata/labs.yaml @@ -107,11 +107,11 @@ role::cache::base::zero_site: 'http://zero.wikimedia.beta.wmflabs.org' role::cache::base::purge_host_only_upload_re: '^upload\.beta\.wmflabs\.org$' role::cache::base::purge_host_not_upload_re: '^(?!upload\.beta\.wmflabs\.org)' -role::cache::base::static_host: 'deployment.wikimedia.beta.wmflabs.org' -role::cache::base::upload_domain: 'upload.beta.wmflabs.org' -role::cache::base::bits_domain: 'bits.beta.wmflabs.org' -role::cache::base::shortener_domain: 'w-beta.wmflabs.org' -role::cache::base::top_domain: 'beta.wmflabs.org' +role::cache::upload::upload_domain: 'upload.beta.wmflabs.org' +role::cache::text::static_host: 'deployment.wikimedia.beta.wmflabs.org' +role::cache::text::bits_domain: 'bits.beta.wmflabs.org' +role::cache::text::shortener_domain: 'w-beta.wmflabs.org' +role::cache::text::top_domain: 'beta.wmflabs.org' role::cache::2layer::storage_parts: - vdb - vdb diff --git a/modules/role/manifests/cache/base.pp b/modules/role/manifests/cache/base.pp index af583d9..baace7e 100644 --- a/modules/role/manifests/cache/base.pp +++ b/modules/role/manifests/cache/base.pp @@ -2,12 +2,6 @@ $zero_site = 'https://zero.wikimedia.org', $purge_host_only_upload_re = '^upload\.wikimedia\.org$', $purge_host_not_upload_re = '^(?!upload\.wikimedia\.org)', - # static_host must serve MediaWiki (e.g. not wwwportal) - $static_host = 'en.wikipedia.org', - $upload_domain = 'upload.wikimedia.org', - $bits_domain = 'bits.wikimedia.org', - $top_domain = 'org', - $shortener_domain = 'w.wiki', ) { include standard include nrpe diff --git a/modules/role/manifests/cache/text.pp b/modules/role/manifests/cache/text.pp index 29726d6..beb7637 100644 --- a/modules/role/manifests/cache/text.pp +++ b/modules/role/manifests/cache/text.pp @@ -1,4 +1,10 @@ -class role::cache::text { +class role::cache::text( + # static_host must serve MediaWiki (e.g. not wwwportal) + $static_host = 'en.wikipedia.org', + $bits_domain = 'bits.wikimedia.org', + $top_domain = 'org', + $shortener_domain = 'w.wiki', +) { require geoip require geoip::dev # for VCL compilation using libGeoIP include role::cache::2layer @@ -93,10 +99,10 @@ $common_vcl_config = { 'cache4xx' => '1m', 'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re, - 'static_host' => $::role::cache::base::static_host, - 'bits_domain' => $::role::cache::base::bits_domain, - 'top_domain' => $::role::cache::base::top_domain, - 'shortener_domain' => $::role::cache::base::shortener_domain, + 'static_host' => $static_host, + 'bits_domain' => $bits_domain, + 'top_domain' => $top_domain, + 'shortener_domain' => $shortener_domain, 'pass_random' => true, } diff --git a/modules/role/manifests/cache/upload.pp b/modules/role/manifests/cache/upload.pp index e5acf4b..f8f3774 100644 --- a/modules/role/manifests/cache/upload.pp +++ b/modules/role/manifests/cache/upload.pp @@ -1,4 +1,6 @@ -class role::cache::upload { +class role::cache::upload( + $upload_domain = 'upload.wikimedia.org', +) { include role::cache::2layer include role::cache::ssl::unified if $::standard::has_ganglia { @@ -58,7 +60,7 @@ $common_vcl_config = { 'cache4xx' => '1m', 'purge_host_regex' => $::role::cache::base::purge_host_only_upload_re, - 'upload_domain' => $::role::cache::base::upload_domain, + 'upload_domain' => $upload_domain, 'allowed_methods' => '^(GET|HEAD|OPTIONS|PURGE)$', } -- To view, visit https://gerrit.wikimedia.org/r/295577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe5b7a46e707444b1f3a486569bf7c05a0740ec7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
