Filippo Giunchedi has submitted this change and it was merged. Change subject: Restbase: add paging support configuration ......................................................................
Restbase: add paging support configuration As of https://github.com/wikimedia/restbase/pull/260 RESTBase supports proper result paging, for which the salt and default_page_size configuration options need to be present. This patch adds the defaults for both production and deployment-prep. Note: salt_key should truly be a secret phrase, so this patch needs a corresponding key in the private repo setting it. Change-Id: I463922e4d27d3272c24575f99aac69bc2eebdcea --- M modules/restbase/manifests/init.pp M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/restbase/manifests/init.pp b/modules/restbase/manifests/init.pp index 3374828..933c086 100644 --- a/modules/restbase/manifests/init.pp +++ b/modules/restbase/manifests/init.pp @@ -44,6 +44,8 @@ $cassandra_defaultConsistency = 'localQuorum', $cassandra_localDc = 'datacenter1', $port = 7231, + $salt_key = 'secretkey', + $page_size = 250, $config_template = 'restbase/config.yaml.erb', $parsoid_uri = 'http://parsoid-lb.eqiad.wikimedia.org', $logstash_host = 'localhost', diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index 044d2f6..a2efd1d 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -191,3 +191,5 @@ conf: port: <%= @port %> spec: *spec + salt: <%= @salt_key %> + default_page_size: <%= @page_size %> diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index b4a759c..c8328ba 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -931,3 +931,5 @@ conf: port: <%= @port %> spec: *spec + salt: <%= @salt_key %> + default_page_size: <%= @page_size %> -- To view, visit https://gerrit.wikimedia.org/r/218336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I463922e4d27d3272c24575f99aac69bc2eebdcea Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Eevans <eev...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
