Giuseppe Lavagetto has submitted this change and it was merged. Change subject: RESTBase: Add the PDF Render service config ......................................................................
RESTBase: Add the PDF Render service config Change-Id: Ibecfec3b43faa67486c35fe7ea50364f7345da25 --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/restbase/server.yaml M modules/restbase/manifests/init.pp M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 5 files changed, 17 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 6d6718d..7c3506c 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -114,6 +114,7 @@ restbase::mathoid_uri: http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042 restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics restbase::eventlogging_service_uri: http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events +restbase::pdfrender_uri: http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252 "mediawiki::log_aggregator": deployment-fluorine02.eqiad.wmflabs:8420 "mediawiki::forward_syslog": deployment-logstash2.deployment-prep.eqiad.wmflabs:10514 mediawiki_memcached_servers: diff --git a/hieradata/role/common/restbase/server.yaml b/hieradata/role/common/restbase/server.yaml index 308e4ff..535cfce 100644 --- a/hieradata/role/common/restbase/server.yaml +++ b/hieradata/role/common/restbase/server.yaml @@ -15,6 +15,7 @@ restbase::mobileapps_uri: "http://mobileapps.svc.%{::mbapps_site}.wmnet:8888"; restbase::mathoid_uri: "http://mathoid.svc.%{::mathoid_site}.wmnet:10042"; restbase::aqs_uri: "http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1"; +restbase::pdfrender_uri: "http://pdfrender.svc.%{::site}.wmnet:5252"; restbase::cassandra_user: restb restbase::cassandra_password: "%{passwords::cassandra::restbase}" restbase::monitoring::monitor_domain: en.wikipedia.org diff --git a/modules/restbase/manifests/init.pp b/modules/restbase/manifests/init.pp index 982116e..b40ae3e 100644 --- a/modules/restbase/manifests/init.pp +++ b/modules/restbase/manifests/init.pp @@ -75,6 +75,9 @@ # [*eventlogging_service_uri*] # Eventlogging service URI. Default: http://eventbus.svc.eqiad.wmnet:8085/v1/events # +# [*pdfrender_uri*] +# PDF Render service URI. Default: http://pdfrender.svc.eqiad.wmnet:5252 +# # [*monitor_domain*] # The domain to monitor during the service's operation. # Default: en.wikipedia.org @@ -110,10 +113,14 @@ 'http://aqs.svc.eqiad.wmnet:7232/analytics.wikimedia.org/v1', $eventlogging_service_uri = 'http://eventbus.svc.eqiad.wmnet:8085/v1/events', + $pdfrender_uri = 'http://pdfrender.svc.eqiad.wmnet:5252', $monitor_domain = 'en.wikipedia.org', $hosts = [$::ipaddress], ) { + require ::service::configuration + $pdfrender_key = $::service::configuration::pdfrender_key + service::node { 'restbase': port => $port, config => template($config_template), diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index cf45e4d..50e76df 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -49,6 +49,10 @@ cache_control: s-maxage=86400, max-age=86400 # Cache headers for purged end points. purged_cache_control: s-maxage=1209600, max-age=0, must-revalidate + pdf: + cache_control: s-maxage=600, max-age=600 + uri: <%= @pdfrender_uri %> + secret: <%= @pdfrender_key %> # A different project template, sharing configuration options. wikimedia.org: &wikimedia.org diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index d84e663..12baccc 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -73,6 +73,10 @@ # Cache headers for purged end points. purged_cache_control: s-maxage=1209600, max-age=0, must-revalidate skip_updates: <%= @skip_updates %> + pdf: + cache_control: s-maxage=600, max-age=600 + uri: <%= @pdfrender_uri %> + secret: <%= @pdfrender_key %> # A different project template, sharing configuration options. wikimedia.org: &wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/323548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibecfec3b43faa67486c35fe7ea50364f7345da25 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Ppchelko <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
