[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: RESTBase: Update the config
Ppchelko has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404956 ) Change subject: RESTBase: Update the config .. RESTBase: Update the config Change-Id: I03fb0f855181340f31fc2f99051513427fa999af --- M puppet/modules/restbase/templates/config.yaml.erb 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Ppchelko: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/restbase/templates/config.yaml.erb b/puppet/modules/restbase/templates/config.yaml.erb index 41eba30..a95f3dd 100644 --- a/puppet/modules/restbase/templates/config.yaml.erb +++ b/puppet/modules/restbase/templates/config.yaml.erb @@ -8,12 +8,10 @@ options: &default_options table: backend: sqlite - dbname: <%= @dbdir %>/mw-vagrant.sqlite3 -table_ng: - backend: sqlite dbname: <%= @dbdir %>/mw-vagrant-ng.sqlite3 parsoid: host: http://localhost:<%= scope['::parsoid::port'] %> + grace_ttl: 3600 action: apiUriTemplate: "{{'http://localhost<%= scope['::port_fragment'] %>/w/api.php'}}" baseUriTemplate: "{{'http://{domain}:7231/{domain}/v1'}}" @@ -25,6 +23,10 @@ cache-control: s-maxage=864000, max-age=86400 mobileapps: host: http://localhost:<%= @mobileapps_port %> +summary: + protocol: http + implementation: mw_api # TODO: change to mcs soon + host: http://localhost:<%= @mobileapps_port %> events: eventlogging_service: uri: http://localhost:<%= @eventlogging_service_port %>/v1/events @@ -35,10 +37,15 @@ host: http://localhost:<%= @citoid_port %> transform: cx_host: http://localhost:<%= @cxserver_port %> +# 10 days Varnish caching, one day client-side +purged_cache_control: s-maxage=864000, max-age=86400 +# Cache control for purged endpoints allowing short-term client caching +purged_cache_control_client_cache: s-maxage=1209600, max-age=300 pdf: cache_control: s-maxage=600, max-age=600 uri: http://localhost:<%= @pdf_service_port %>/ secret: <%= @pdf_service_secret %> + scheme: http wikimedia.org: &wikimedia x-modules: -- To view, visit https://gerrit.wikimedia.org/r/404956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03fb0f855181340f31fc2f99051513427fa999af Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: RESTBase: Update the config
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404956 ) Change subject: RESTBase: Update the config .. RESTBase: Update the config Change-Id: I03fb0f855181340f31fc2f99051513427fa999af --- M puppet/modules/restbase/templates/config.yaml.erb 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/56/404956/1 diff --git a/puppet/modules/restbase/templates/config.yaml.erb b/puppet/modules/restbase/templates/config.yaml.erb index 41eba30..6a01e25 100644 --- a/puppet/modules/restbase/templates/config.yaml.erb +++ b/puppet/modules/restbase/templates/config.yaml.erb @@ -8,12 +8,10 @@ options: &default_options table: backend: sqlite - dbname: <%= @dbdir %>/mw-vagrant.sqlite3 -table_ng: - backend: sqlite dbname: <%= @dbdir %>/mw-vagrant-ng.sqlite3 parsoid: host: http://localhost:<%= scope['::parsoid::port'] %> + grace_ttl: 1 action: apiUriTemplate: "{{'http://localhost<%= scope['::port_fragment'] %>/w/api.php'}}" baseUriTemplate: "{{'http://{domain}:7231/{domain}/v1'}}" @@ -25,6 +23,10 @@ cache-control: s-maxage=864000, max-age=86400 mobileapps: host: http://localhost:<%= @mobileapps_port %> +summary: + protocol: http + implementation: mw_api # TODO: change to mcs soon + host: http://localhost:<%= @mobileapps_port %> events: eventlogging_service: uri: http://localhost:<%= @eventlogging_service_port %>/v1/events @@ -35,10 +37,15 @@ host: http://localhost:<%= @citoid_port %> transform: cx_host: http://localhost:<%= @cxserver_port %> +# 10 days Varnish caching, one day client-side +purged_cache_control: s-maxage=864000, max-age=86400 +# Cache control for purged endpoints allowing short-term client caching +purged_cache_control_client_cache: s-maxage=1209600, max-age=300 pdf: cache_control: s-maxage=600, max-age=600 uri: http://localhost:<%= @pdf_service_port %>/ secret: <%= @pdf_service_secret %> + scheme: http wikimedia.org: &wikimedia x-modules: -- To view, visit https://gerrit.wikimedia.org/r/404956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03fb0f855181340f31fc2f99051513427fa999af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits