[MediaWiki-commits] [Gerrit] RESTBase: Update config to new style - change (mediawiki/vagrant)

2016-02-17 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged.

Change subject: RESTBase: Update config to new style
..


RESTBase: Update config to new style

There was a backwards-incompatible change in config style
for RESTBase where modules definitions are an array, not an
object any more. Updating vagrant to use new config style.

Change-Id: Iddb4278df1cd3a847f12ce444acc66d65e2dd667
---
M puppet/modules/restbase/templates/config.yaml.erb
1 file changed, 30 insertions(+), 32 deletions(-)

Approvals:
  Mobrovac: 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 a8b0924..f38415a 100644
--- a/puppet/modules/restbase/templates/config.yaml.erb
+++ b/puppet/modules/restbase/templates/config.yaml.erb
@@ -4,41 +4,39 @@
 # in the root_spec further down.
 default_project: _project
   x-modules:
-/:
-  - path: projects/wmf_sqlite.yaml
-options: _options
-  table:
-hosts: [localhost]
-keyspace: system
-username: cassandra
-password: cassandra
-defaultConsistency: one # or 'localQuorum' for production
-storage_groups:
-  - name: group.local
-domains: /./
-dbname: <%= @dbdir %>/mw-vagrant.sqlite3
-version: 1
-  parsoid:
-host: http://localhost:<%= scope['::mediawiki::parsoid::port'] %>
-  action:
-apiUriTemplate: "{{'http://localhost<%= scope['::port_fragment'] 
%>/w/api.php'}}"
-  graphoid:
-host: http://localhost:<%= @graphoid_port %>
-  mathoid:
-host: http://localhost:<%= @mathoid_port %>
-# 10 days Varnish caching, one day client-side
-cache-control: s-maxage=864000, max-age=86400
-  mobileapps:
-host: http://appservice.wmflabs.org
+- path: projects/wmf_sqlite.yaml
+  options: _options
+table:
+  hosts: [localhost]
+  keyspace: system
+  username: cassandra
+  password: cassandra
+  defaultConsistency: one # or 'localQuorum' for production
+  storage_groups:
+- name: group.local
+  domains: /./
+  dbname: <%= @dbdir %>/mw-vagrant.sqlite3
+  version: 1
+parsoid:
+  host: http://localhost:<%= scope['::mediawiki::parsoid::port'] %>
+action:
+  apiUriTemplate: "{{'http://localhost<%= scope['::port_fragment'] 
%>/w/api.php'}}"
+graphoid:
+  host: http://localhost:<%= @graphoid_port %>
+mathoid:
+  host: http://localhost:<%= @mathoid_port %>
+  # 10 days Varnish caching, one day client-side
+  cache-control: s-maxage=864000, max-age=86400
+mobileapps:
+  host: http://appservice.wmflabs.org
 
 wikimedia.org: 
   x-modules:
-/:
-  - path: projects/wikimedia.org_sqlite.yaml
-options:
-  <<: *default_options
-  pageviews:
-host: https://wikimedia.org/api/rest_v1/metrics
+- path: projects/wikimedia.org_sqlite.yaml
+  options:
+<<: *default_options
+pageviews:
+  host: https://wikimedia.org/api/rest_v1/metrics
 
 
 # The root of the spec tree. Domains tend to share specs by referencing them

-- 
To view, visit https://gerrit.wikimedia.org/r/271328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddb4278df1cd3a847f12ce444acc66d65e2dd667
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] RESTBase: Update config to new style - change (mediawiki/vagrant)

2016-02-17 Thread Ppchelko (Code Review) 
Ppchelko has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/271328

Change subject: RESTBase: Update config to new style
..

RESTBase: Update config to new style

There was a backwards-incompatible change in config style
for RESTBase where modules definitions are an array, not an
object any more. Updating vagrant to use new config style.

Change-Id: Iddb4278df1cd3a847f12ce444acc66d65e2dd667
---
M puppet/modules/restbase/templates/config.yaml.erb
1 file changed, 30 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/28/271328/1

diff --git a/puppet/modules/restbase/templates/config.yaml.erb 
b/puppet/modules/restbase/templates/config.yaml.erb
index a8b0924..f38415a 100644
--- a/puppet/modules/restbase/templates/config.yaml.erb
+++ b/puppet/modules/restbase/templates/config.yaml.erb
@@ -4,41 +4,39 @@
 # in the root_spec further down.
 default_project: _project
   x-modules:
-/:
-  - path: projects/wmf_sqlite.yaml
-options: _options
-  table:
-hosts: [localhost]
-keyspace: system
-username: cassandra
-password: cassandra
-defaultConsistency: one # or 'localQuorum' for production
-storage_groups:
-  - name: group.local
-domains: /./
-dbname: <%= @dbdir %>/mw-vagrant.sqlite3
-version: 1
-  parsoid:
-host: http://localhost:<%= scope['::mediawiki::parsoid::port'] %>
-  action:
-apiUriTemplate: "{{'http://localhost<%= scope['::port_fragment'] 
%>/w/api.php'}}"
-  graphoid:
-host: http://localhost:<%= @graphoid_port %>
-  mathoid:
-host: http://localhost:<%= @mathoid_port %>
-# 10 days Varnish caching, one day client-side
-cache-control: s-maxage=864000, max-age=86400
-  mobileapps:
-host: http://appservice.wmflabs.org
+- path: projects/wmf_sqlite.yaml
+  options: _options
+table:
+  hosts: [localhost]
+  keyspace: system
+  username: cassandra
+  password: cassandra
+  defaultConsistency: one # or 'localQuorum' for production
+  storage_groups:
+- name: group.local
+  domains: /./
+  dbname: <%= @dbdir %>/mw-vagrant.sqlite3
+  version: 1
+parsoid:
+  host: http://localhost:<%= scope['::mediawiki::parsoid::port'] %>
+action:
+  apiUriTemplate: "{{'http://localhost<%= scope['::port_fragment'] 
%>/w/api.php'}}"
+graphoid:
+  host: http://localhost:<%= @graphoid_port %>
+mathoid:
+  host: http://localhost:<%= @mathoid_port %>
+  # 10 days Varnish caching, one day client-side
+  cache-control: s-maxage=864000, max-age=86400
+mobileapps:
+  host: http://appservice.wmflabs.org
 
 wikimedia.org: 
   x-modules:
-/:
-  - path: projects/wikimedia.org_sqlite.yaml
-options:
-  <<: *default_options
-  pageviews:
-host: https://wikimedia.org/api/rest_v1/metrics
+- path: projects/wikimedia.org_sqlite.yaml
+  options:
+<<: *default_options
+pageviews:
+  host: https://wikimedia.org/api/rest_v1/metrics
 
 
 # The root of the spec tree. Domains tend to share specs by referencing them

-- 
To view, visit https://gerrit.wikimedia.org/r/271328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddb4278df1cd3a847f12ce444acc66d65e2dd667
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits