[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Bring back all target nodes
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/406113 ) Change subject: Scap: Bring back all target nodes .. Scap: Bring back all target nodes Bug: T184100 Change-Id: I62f06e25068a2127c6381515ddab451815e7603c --- M scap/targets 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/targets b/scap/targets index 2fdcb9d..7a8ee83 100644 --- a/scap/targets +++ b/scap/targets @@ -3,7 +3,9 @@ restbase1010.eqiad.wmnet restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet +restbase1013.eqiad.wmnet restbase1014.eqiad.wmnet +restbase1015.eqiad.wmnet restbase1016.eqiad.wmnet restbase1017.eqiad.wmnet restbase1018.eqiad.wmnet @@ -12,6 +14,9 @@ restbase2004.codfw.wmnet restbase2005.codfw.wmnet restbase2006.codfw.wmnet +restbase2007.codfw.wmnet +restbase2008.codfw.wmnet +restbase2009.codfw.wmnet restbase2010.codfw.wmnet restbase2011.codfw.wmnet restbase2012.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/406113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62f06e25068a2127c6381515ddab451815e7603c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Bring back all target nodes
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/406113 ) Change subject: Scap: Bring back all target nodes .. Scap: Bring back all target nodes Bug: T184100 Change-Id: I62f06e25068a2127c6381515ddab451815e7603c --- M scap/targets 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/13/406113/1 diff --git a/scap/targets b/scap/targets index 2fdcb9d..7a8ee83 100644 --- a/scap/targets +++ b/scap/targets @@ -3,7 +3,9 @@ restbase1010.eqiad.wmnet restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet +restbase1013.eqiad.wmnet restbase1014.eqiad.wmnet +restbase1015.eqiad.wmnet restbase1016.eqiad.wmnet restbase1017.eqiad.wmnet restbase1018.eqiad.wmnet @@ -12,6 +14,9 @@ restbase2004.codfw.wmnet restbase2005.codfw.wmnet restbase2006.codfw.wmnet +restbase2007.codfw.wmnet +restbase2008.codfw.wmnet +restbase2009.codfw.wmnet restbase2010.codfw.wmnet restbase2011.codfw.wmnet restbase2012.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/406113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62f06e25068a2127c6381515ddab451815e7603c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Update change-propagation to 214d48e
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404959 ) Change subject: Update change-propagation to 214d48e .. Update change-propagation to 214d48e List of changes: cdc9d97 Added jobqueue configuration 09d0338 Copy the correct config files into the container 283d689 Rerender mobile-sectionss and summary on MW purge and null edit. f82d46b Update node-rdkafka driver to version 2 xxx Update node module dependencies Change-Id: Ic4ccbd8970cba5cc810793a4c0719cf904a0f6d0 --- D node_modules/.bin/node-pre-gyp D node_modules/.bin/nopt D node_modules/.bin/rc D node_modules/abbrev/LICENSE D node_modules/abbrev/abbrev.js D node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json D node_modules/aproba/LICENSE D node_modules/aproba/index.js D node_modules/aproba/package.json D node_modules/are-we-there-yet/CHANGES.md~ D node_modules/are-we-there-yet/LICENSE D node_modules/are-we-there-yet/index.js D node_modules/are-we-there-yet/node_modules/isarray/.npmignore D node_modules/are-we-there-yet/node_modules/isarray/.travis.yml D node_modules/are-we-there-yet/node_modules/isarray/Makefile D node_modules/are-we-there-yet/node_modules/isarray/component.json D node_modules/are-we-there-yet/node_modules/isarray/index.js D node_modules/are-we-there-yet/node_modules/isarray/package.json D node_modules/are-we-there-yet/node_modules/isarray/test.js D node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore D node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml D node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE D node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js D node_modules/are-we-there-yet/node_modules/readable-stream/package.json D node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable.js D node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore D node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE D node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js D node_modules/are-we-there-yet/node_modules/string_decoder/package.json D node_modules/are-we-there-yet/package.json D node_modules/are-we-there-yet/tracker-base.js D node_modules/are-we-there-yet/tracker-group.js D node_modules/are-we-there-yet/tracker-stream.js D node_modules/are-we-there-yet/tracker.js D node_modules/block-stream/LICENSE D node_modules/block-stream/block-stream.js D node_modules/block-stream/package.json D node_modules/console-control-strings/LICENSE D node_modules/console-control-strings/README.md~ D node_modules/console-control-strings/index.js D node_modules/console-control-strings/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modu
[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Update change-propagation to 214d48e
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404959 ) Change subject: Update change-propagation to 214d48e .. Update change-propagation to 214d48e List of changes: cdc9d97 Added jobqueue configuration 09d0338 Copy the correct config files into the container 283d689 Rerender mobile-sectionss and summary on MW purge and null edit. f82d46b Update node-rdkafka driver to version 2 xxx Update node module dependencies Change-Id: Ic4ccbd8970cba5cc810793a4c0719cf904a0f6d0 --- D node_modules/.bin/node-pre-gyp D node_modules/.bin/nopt D node_modules/.bin/rc D node_modules/abbrev/LICENSE D node_modules/abbrev/abbrev.js D node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json D node_modules/aproba/LICENSE D node_modules/aproba/index.js D node_modules/aproba/package.json D node_modules/are-we-there-yet/CHANGES.md~ D node_modules/are-we-there-yet/LICENSE D node_modules/are-we-there-yet/index.js D node_modules/are-we-there-yet/node_modules/isarray/.npmignore D node_modules/are-we-there-yet/node_modules/isarray/.travis.yml D node_modules/are-we-there-yet/node_modules/isarray/Makefile D node_modules/are-we-there-yet/node_modules/isarray/component.json D node_modules/are-we-there-yet/node_modules/isarray/index.js D node_modules/are-we-there-yet/node_modules/isarray/package.json D node_modules/are-we-there-yet/node_modules/isarray/test.js D node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore D node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml D node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE D node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js D node_modules/are-we-there-yet/node_modules/readable-stream/package.json D node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable.js D node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore D node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE D node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js D node_modules/are-we-there-yet/node_modules/string_decoder/package.json D node_modules/are-we-there-yet/package.json D node_modules/are-we-there-yet/tracker-base.js D node_modules/are-we-there-yet/tracker-group.js D node_modules/are-we-there-yet/tracker-stream.js D node_modules/are-we-there-yet/tracker.js D node_modules/block-stream/LICENSE D node_modules/block-stream/block-stream.js D node_modules/block-stream/package.json D node_modules/console-control-strings/LICENSE D node_modules/console-control-strings/README.md~ D node_modules/console-control-strings/index.js D node_modules/console-control-strings/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modules/_use
[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
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back `restbase201[012]`
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404952 ) Change subject: Scap: Add back `restbase201[012]` .. Scap: Add back `restbase201[012]` Bug: T184100 Change-Id: I6ba72dcb1fd33dd146f2988c31f639a10e423630 --- M scap/targets 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/targets b/scap/targets index 4e968c5..2fdcb9d 100644 --- a/scap/targets +++ b/scap/targets @@ -12,3 +12,6 @@ restbase2004.codfw.wmnet restbase2005.codfw.wmnet restbase2006.codfw.wmnet +restbase2010.codfw.wmnet +restbase2011.codfw.wmnet +restbase2012.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/404952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ba72dcb1fd33dd146f2988c31f639a10e423630 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back `restbase201[012]`
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404952 ) Change subject: Scap: Add back `restbase201[012]` .. Scap: Add back `restbase201[012]` Bug: T184100 Change-Id: I6ba72dcb1fd33dd146f2988c31f639a10e423630 --- M scap/targets 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/52/404952/1 diff --git a/scap/targets b/scap/targets index 4e968c5..2fdcb9d 100644 --- a/scap/targets +++ b/scap/targets @@ -12,3 +12,6 @@ restbase2004.codfw.wmnet restbase2005.codfw.wmnet restbase2006.codfw.wmnet +restbase2010.codfw.wmnet +restbase2011.codfw.wmnet +restbase2012.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/404952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ba72dcb1fd33dd146f2988c31f639a10e423630 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back `restbase101[678]`
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404950 ) Change subject: Scap: Add back `restbase101[678]` .. Scap: Add back `restbase101[678]` Bug: T184100 Change-Id: If2ba1356887ddbb159e39ff5170c8730c18e18f8 --- M scap/targets 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/targets b/scap/targets index 21a5c1f..4e968c5 100644 --- a/scap/targets +++ b/scap/targets @@ -4,6 +4,9 @@ restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet restbase1014.eqiad.wmnet +restbase1016.eqiad.wmnet +restbase1017.eqiad.wmnet +restbase1018.eqiad.wmnet restbase2002.codfw.wmnet restbase2003.codfw.wmnet restbase2004.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/404950 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2ba1356887ddbb159e39ff5170c8730c18e18f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back `restbase101[678]`
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404950 ) Change subject: Scap: Add back `restbase101[678]` .. Scap: Add back `restbase101[678]` Bug: T184100 Change-Id: If2ba1356887ddbb159e39ff5170c8730c18e18f8 --- M scap/targets 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/50/404950/1 diff --git a/scap/targets b/scap/targets index 21a5c1f..4e968c5 100644 --- a/scap/targets +++ b/scap/targets @@ -4,6 +4,9 @@ restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet restbase1014.eqiad.wmnet +restbase1016.eqiad.wmnet +restbase1017.eqiad.wmnet +restbase1018.eqiad.wmnet restbase2002.codfw.wmnet restbase2003.codfw.wmnet restbase2004.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/404950 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2ba1356887ddbb159e39ff5170c8730c18e18f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to d74e3d9
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404948 ) Change subject: Update restbase to d74e3d9 .. Update restbase to d74e3d9 List of changes: d74e3d9 Normalize namings of cache-control options. Change-Id: Iafea77676a3e8e3e8e4ddbf336236a29ae47de9b --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 7550787..d74e3d9 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 755078771f6a551a4bc8c2b0bcc5f2d29bee40cd +Subproject commit d74e3d9edb0d8252ee412d1efb82217b8f1ee45b -- To view, visit https://gerrit.wikimedia.org/r/404948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafea77676a3e8e3e8e4ddbf336236a29ae47de9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to d74e3d9
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404948 ) Change subject: Update restbase to d74e3d9 .. Update restbase to d74e3d9 List of changes: d74e3d9 Normalize namings of cache-control options. Change-Id: Iafea77676a3e8e3e8e4ddbf336236a29ae47de9b --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/48/404948/1 diff --git a/restbase b/restbase index 7550787..d74e3d9 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 755078771f6a551a4bc8c2b0bcc5f2d29bee40cd +Subproject commit d74e3d9edb0d8252ee412d1efb82217b8f1ee45b -- To view, visit https://gerrit.wikimedia.org/r/404948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafea77676a3e8e3e8e4ddbf336236a29ae47de9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Update change-propagation to 341eb53"
Hello Ppchelko, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/404734 to review the following change. Change subject: Revert "Update change-propagation to 341eb53" .. Revert "Update change-propagation to 341eb53" This reverts commit 8f882bf3d2da330541e45f58c0ed9a79ff0b4360. Change-Id: Icd58bf5b813fadb6aba0aaab69826fae12c3d8ce --- A node_modules/.bin/node-pre-gyp A node_modules/.bin/nopt A node_modules/.bin/rc A node_modules/abbrev/LICENSE A node_modules/abbrev/abbrev.js A node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json A node_modules/aproba/LICENSE A node_modules/aproba/index.js A node_modules/aproba/package.json A node_modules/are-we-there-yet/CHANGES.md~ A node_modules/are-we-there-yet/LICENSE A node_modules/are-we-there-yet/index.js A node_modules/are-we-there-yet/node_modules/isarray/.npmignore A node_modules/are-we-there-yet/node_modules/isarray/.travis.yml A node_modules/are-we-there-yet/node_modules/isarray/Makefile A node_modules/are-we-there-yet/node_modules/isarray/component.json A node_modules/are-we-there-yet/node_modules/isarray/index.js A node_modules/are-we-there-yet/node_modules/isarray/package.json A node_modules/are-we-there-yet/node_modules/isarray/test.js A node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore A node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml A node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE A node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js A node_modules/are-we-there-yet/node_modules/readable-stream/package.json A node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js A node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/readable.js A node_modules/are-we-there-yet/node_modules/readable-stream/transform.js A node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/writable.js A node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore A node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE A node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js A node_modules/are-we-there-yet/node_modules/string_decoder/package.json A node_modules/are-we-there-yet/package.json A node_modules/are-we-there-yet/tracker-base.js A node_modules/are-we-there-yet/tracker-group.js A node_modules/are-we-there-yet/tracker-stream.js A node_modules/are-we-there-yet/tracker.js A node_modules/block-stream/LICENSE A node_modules/block-stream/block-stream.js A node_modules/block-stream/package.json A node_modules/console-control-strings/LICENSE A node_modules/console-control-strings/README.md~ A node_modules/console-control-strings/index.js A node_modules/console-control-strings/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js D node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/co
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Update change-propagation to 341eb53"
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404734 ) Change subject: Revert "Update change-propagation to 341eb53" .. Revert "Update change-propagation to 341eb53" This reverts commit 8f882bf3d2da330541e45f58c0ed9a79ff0b4360. Change-Id: Icd58bf5b813fadb6aba0aaab69826fae12c3d8ce --- A node_modules/.bin/node-pre-gyp A node_modules/.bin/nopt A node_modules/.bin/rc A node_modules/abbrev/LICENSE A node_modules/abbrev/abbrev.js A node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json A node_modules/aproba/LICENSE A node_modules/aproba/index.js A node_modules/aproba/package.json A node_modules/are-we-there-yet/CHANGES.md~ A node_modules/are-we-there-yet/LICENSE A node_modules/are-we-there-yet/index.js A node_modules/are-we-there-yet/node_modules/isarray/.npmignore A node_modules/are-we-there-yet/node_modules/isarray/.travis.yml A node_modules/are-we-there-yet/node_modules/isarray/Makefile A node_modules/are-we-there-yet/node_modules/isarray/component.json A node_modules/are-we-there-yet/node_modules/isarray/index.js A node_modules/are-we-there-yet/node_modules/isarray/package.json A node_modules/are-we-there-yet/node_modules/isarray/test.js A node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore A node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml A node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE A node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js A node_modules/are-we-there-yet/node_modules/readable-stream/package.json A node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js A node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/readable.js A node_modules/are-we-there-yet/node_modules/readable-stream/transform.js A node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js A node_modules/are-we-there-yet/node_modules/readable-stream/writable.js A node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore A node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE A node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js A node_modules/are-we-there-yet/node_modules/string_decoder/package.json A node_modules/are-we-there-yet/package.json A node_modules/are-we-there-yet/tracker-base.js A node_modules/are-we-there-yet/tracker-group.js A node_modules/are-we-there-yet/tracker-stream.js A node_modules/are-we-there-yet/tracker.js A node_modules/block-stream/LICENSE A node_modules/block-stream/block-stream.js A node_modules/block-stream/package.json A node_modules/console-control-strings/LICENSE A node_modules/console-control-strings/README.md~ A node_modules/console-control-strings/index.js A node_modules/console-control-strings/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js D node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/core-js/library/modules/es6.symbol.js M node_m
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update change-propagation to 341eb53
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404700 ) Change subject: Update change-propagation to 341eb53 .. Update change-propagation to 341eb53 List of changes: 341eb53 Fixed sha1-based deduplication and added dedupe tests xxx Update node module dependencies Change-Id: I5244540736f0639e247c679b19ce6355c1d51fe9 --- D node_modules/.bin/node-pre-gyp D node_modules/.bin/nopt D node_modules/.bin/rc D node_modules/abbrev/LICENSE D node_modules/abbrev/abbrev.js D node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json D node_modules/aproba/LICENSE D node_modules/aproba/index.js D node_modules/aproba/package.json D node_modules/are-we-there-yet/CHANGES.md~ D node_modules/are-we-there-yet/LICENSE D node_modules/are-we-there-yet/index.js D node_modules/are-we-there-yet/node_modules/isarray/.npmignore D node_modules/are-we-there-yet/node_modules/isarray/.travis.yml D node_modules/are-we-there-yet/node_modules/isarray/Makefile D node_modules/are-we-there-yet/node_modules/isarray/component.json D node_modules/are-we-there-yet/node_modules/isarray/index.js D node_modules/are-we-there-yet/node_modules/isarray/package.json D node_modules/are-we-there-yet/node_modules/isarray/test.js D node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore D node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml D node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE D node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js D node_modules/are-we-there-yet/node_modules/readable-stream/package.json D node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable.js D node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore D node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE D node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js D node_modules/are-we-there-yet/node_modules/string_decoder/package.json D node_modules/are-we-there-yet/package.json D node_modules/are-we-there-yet/tracker-base.js D node_modules/are-we-there-yet/tracker-group.js D node_modules/are-we-there-yet/tracker-stream.js D node_modules/are-we-there-yet/tracker.js D node_modules/block-stream/LICENSE D node_modules/block-stream/block-stream.js D node_modules/block-stream/package.json D node_modules/console-control-strings/LICENSE D node_modules/console-control-strings/README.md~ D node_modules/console-control-strings/index.js D node_modules/console-control-strings/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/core-js
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update change-propagation to 341eb53
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404700 ) Change subject: Update change-propagation to 341eb53 .. Update change-propagation to 341eb53 List of changes: 341eb53 Fixed sha1-based deduplication and added dedupe tests xxx Update node module dependencies Change-Id: I5244540736f0639e247c679b19ce6355c1d51fe9 --- D node_modules/.bin/node-pre-gyp D node_modules/.bin/nopt D node_modules/.bin/rc D node_modules/abbrev/LICENSE D node_modules/abbrev/abbrev.js D node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json D node_modules/aproba/LICENSE D node_modules/aproba/index.js D node_modules/aproba/package.json D node_modules/are-we-there-yet/CHANGES.md~ D node_modules/are-we-there-yet/LICENSE D node_modules/are-we-there-yet/index.js D node_modules/are-we-there-yet/node_modules/isarray/.npmignore D node_modules/are-we-there-yet/node_modules/isarray/.travis.yml D node_modules/are-we-there-yet/node_modules/isarray/Makefile D node_modules/are-we-there-yet/node_modules/isarray/component.json D node_modules/are-we-there-yet/node_modules/isarray/index.js D node_modules/are-we-there-yet/node_modules/isarray/package.json D node_modules/are-we-there-yet/node_modules/isarray/test.js D node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore D node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml D node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE D node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js D node_modules/are-we-there-yet/node_modules/readable-stream/package.json D node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/readable.js D node_modules/are-we-there-yet/node_modules/readable-stream/transform.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js D node_modules/are-we-there-yet/node_modules/readable-stream/writable.js D node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore D node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE D node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js D node_modules/are-we-there-yet/node_modules/string_decoder/package.json D node_modules/are-we-there-yet/package.json D node_modules/are-we-there-yet/tracker-base.js D node_modules/are-we-there-yet/tracker-group.js D node_modules/are-we-there-yet/tracker-stream.js D node_modules/are-we-there-yet/tracker.js D node_modules/block-stream/LICENSE D node_modules/block-stream/block-stream.js D node_modules/block-stream/package.json D node_modules/console-control-strings/LICENSE D node_modules/console-control-strings/README.md~ D node_modules/console-control-strings/index.js D node_modules/console-control-strings/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/core-js/library
[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Config: Switch htmlCacheUpdates for all but en, commons, wik...
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403704 ) Change subject: Config: Switch htmlCacheUpdates for all but en, commons, wikidata .. Config: Switch htmlCacheUpdates for all but en, commons, wikidata Bug: T182023 Change-Id: I5e2876de911f08c392cfc479d9ac0e80d76eb4a7 --- M scap/templates/config.yaml.j2 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved Ppchelko: Looks good to me, but someone else must approve diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 7b8140a..cf20ab3 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -49,13 +49,13 @@ agentOptions: keepAlive: true <%- endfor %> -# Temporary section - we are only enabling the htmlCacheUpdate for wiktionaries +# Temporary section - we are only enabling the htmlCacheUpdate for all but enwiki, commons and wikidata # Later this will be moved to the vars.yaml as all the other jobs. htmlCacheUpdate: topic: 'mediawiki.job.htmlCacheUpdate' -match: +match_not: meta: -domain: '/(?:^ceb\.wikipedia\.org$)|(?:^ru\.wikipedia\.org$)|(?:.*\.wikibooks\.org$)|(?:.*\.wikinews\.org$)|(?:.*\.wikiquote\.org$)|(?:.*\.wikisource\.org$)|(?:.*\.wikiversity\.org$)|(?:.*\.wikivoyage\.org$)|(?:.*\.wiktionary\.org$)/' +domain: '/(?:^en\.wikipedia\.org$)|(?:^commons\.wikimedia\.org$)|(?:.*wikidata\.org$)/' exec: method: post uri: '<%= jobrunner_uri %>' -- To view, visit https://gerrit.wikimedia.org/r/403704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e2876de911f08c392cfc479d9ac0e80d76eb4a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Remove the -ng suffix from table and storage module ...
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403912 )
Change subject: Config: Remove the -ng suffix from table and storage module name
..
Config: Remove the -ng suffix from table and storage module name
Bug: T184199
Change-Id: I08428d6f5092ca694aa6e10157c62f48faf6a53e
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 58503f4..f90e76d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -53,8 +53,8 @@
x-modules:
- path: projects/wmf_default.yaml
options: &default_options
-table_ng:
- backend: cassandra-ng
+table:
+ backend: cassandra
hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else
seeds|join("','") %>']
keyspace: system
localDc: <%= cassandra_local_dc %>
--
To view, visit https://gerrit.wikimedia.org/r/403912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08428d6f5092ca694aa6e10157c62f48faf6a53e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Remove the -ng suffix from table and storage module ...
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403912 )
Change subject: Config: Remove the -ng suffix from table and storage module name
..
Config: Remove the -ng suffix from table and storage module name
Bug: T184199
Change-Id: I08428d6f5092ca694aa6e10157c62f48faf6a53e
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/12/403912/1
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 58503f4..f90e76d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -53,8 +53,8 @@
x-modules:
- path: projects/wmf_default.yaml
options: &default_options
-table_ng:
- backend: cassandra-ng
+table:
+ backend: cassandra
hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else
seeds|join("','") %>']
keyspace: system
localDc: <%= cassandra_local_dc %>
--
To view, visit https://gerrit.wikimedia.org/r/403912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08428d6f5092ca694aa6e10157c62f48faf6a53e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 7550787
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403911 ) Change subject: Update restbase to 7550787 .. Update restbase to 7550787 List of changes: 7550787 Config: rename the table_ng option back to table Change-Id: I29d96a0cb4ec3f4b49599e61f3c44818057b3528 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 54d3e72..7550787 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 54d3e728e54a005cabc97adf111a99b2846b70f3 +Subproject commit 755078771f6a551a4bc8c2b0bcc5f2d29bee40cd -- To view, visit https://gerrit.wikimedia.org/r/403911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29d96a0cb4ec3f4b49599e61f3c44818057b3528 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 7550787
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403911 ) Change subject: Update restbase to 7550787 .. Update restbase to 7550787 List of changes: 7550787 Config: rename the table_ng option back to table Change-Id: I29d96a0cb4ec3f4b49599e61f3c44818057b3528 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/11/403911/1 diff --git a/restbase b/restbase index 54d3e72..7550787 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 54d3e728e54a005cabc97adf111a99b2846b70f3 +Subproject commit 755078771f6a551a4bc8c2b0bcc5f2d29bee40cd -- To view, visit https://gerrit.wikimedia.org/r/403911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29d96a0cb4ec3f4b49599e61f3c44818057b3528 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Config: Switch htmlCacheUpdates for all but en, commons, wik...
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403704 ) Change subject: Config: Switch htmlCacheUpdates for all but en, commons, wikidata .. Config: Switch htmlCacheUpdates for all but en, commons, wikidata Bug: T182023 Change-Id: I5e2876de911f08c392cfc479d9ac0e80d76eb4a7 --- M scap/templates/config.yaml.j2 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy refs/changes/04/403704/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 7b8140a..cf20ab3 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -49,13 +49,13 @@ agentOptions: keepAlive: true <%- endfor %> -# Temporary section - we are only enabling the htmlCacheUpdate for wiktionaries +# Temporary section - we are only enabling the htmlCacheUpdate for all but enwiki, commons and wikidata # Later this will be moved to the vars.yaml as all the other jobs. htmlCacheUpdate: topic: 'mediawiki.job.htmlCacheUpdate' -match: +match_not: meta: -domain: '/(?:^ceb\.wikipedia\.org$)|(?:^ru\.wikipedia\.org$)|(?:.*\.wikibooks\.org$)|(?:.*\.wikinews\.org$)|(?:.*\.wikiquote\.org$)|(?:.*\.wikisource\.org$)|(?:.*\.wikiversity\.org$)|(?:.*\.wikivoyage\.org$)|(?:.*\.wiktionary\.org$)/' +domain: '/(?:^en\.wikipedia\.org$)|(?:^commons\.wikimedia\.org$)|(?:.*wikidata\.org$)/' exec: method: post uri: '<%= jobrunner_uri %>' -- To view, visit https://gerrit.wikimedia.org/r/403704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e2876de911f08c392cfc479d9ac0e80d76eb4a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: JobQueue: Use EventBus for HTMLCacheUpdate except en, common...
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403703 ) Change subject: JobQueue: Use EventBus for HTMLCacheUpdate except en, commons, wikidata .. JobQueue: Use EventBus for HTMLCacheUpdate except en, commons, wikidata This is a second step towards integrating htmlCacheUpdate jobs into the EventBus system. With this commit we switch them for all wikis but enwiki, commonswiki and wikidatawiki, meaning that 50% of jobs will run on the old infra and the other 50% will run on EventBus. Bug: T182023 Change-Id: I31cc990b3baf7914236b7b56aea8c2ff8102cc07 --- M wmf-config/InitialiseSettings.php 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/403703/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a16e30c..15a4ec9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19652,19 +19652,18 @@ 'votewiki' => false, ], -// Temporary code for the first test of htmlCacheUpdate -// on the EventBus JobQueue -disable old queue on wiktionaries only +// Temporary code for gradually integrating htmlCacheUpdate +// jobs into the EventBus JobQueue - T182023 +// Step 2: enable everywhere but wikidata, enwiki and commons 'wmgDisableHTMLCacheUpdateInRedis' => [ - 'default' => false, - 'cebwiki' => true, - 'ruwiki' => true, - 'wikibooks' => true, - 'wikinews' => true, - 'wikiquote' => true, - 'wikisource' => true, - 'wikiversity' => true, - 'wikivoyage' => true, - 'wiktionary' => true, + 'default' => true, + 'wikitech' => false, + 'private' => false, + 'loginwiki' => false, + 'votewiki' => false, + 'commonswiki' => false, + 'enwiki' => false, + 'wikidatawiki' => false, ], 'wmgUseCapiunto' => [ -- To view, visit https://gerrit.wikimedia.org/r/403703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31cc990b3baf7914236b7b56aea8c2ff8102cc07 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back restbase1011 to targets
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403402 ) Change subject: Scap: Add back restbase1011 to targets .. Scap: Add back restbase1011 to targets Bug: T184100 Change-Id: Iae453cfe3a3e65ea15f564ecbb41c3efcb3d2526 --- M scap/targets 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/targets b/scap/targets index 7231752..21a5c1f 100644 --- a/scap/targets +++ b/scap/targets @@ -1,6 +1,7 @@ restbase1008.eqiad.wmnet restbase1009.eqiad.wmnet restbase1010.eqiad.wmnet +restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet restbase1014.eqiad.wmnet restbase2002.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/403402 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae453cfe3a3e65ea15f564ecbb41c3efcb3d2526 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back restbase1011 to targets
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403402 ) Change subject: Scap: Add back restbase1011 to targets .. Scap: Add back restbase1011 to targets Bug: T184100 Change-Id: Iae453cfe3a3e65ea15f564ecbb41c3efcb3d2526 --- M scap/targets 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/02/403402/1 diff --git a/scap/targets b/scap/targets index 7231752..21a5c1f 100644 --- a/scap/targets +++ b/scap/targets @@ -1,6 +1,7 @@ restbase1008.eqiad.wmnet restbase1009.eqiad.wmnet restbase1010.eqiad.wmnet +restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet restbase1014.eqiad.wmnet restbase2002.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/403402 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae453cfe3a3e65ea15f564ecbb41c3efcb3d2526 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Checks: Wait a bit before repooling a server
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403395 ) Change subject: Checks: Wait a bit before repooling a server .. Checks: Wait a bit before repooling a server It takes approximately 45 seconds for each RESTBase process to start up, so wait for 50 seconds before repooling a server so as to have at least two workers running at that point. Change-Id: I37a412a4b90a5c77bcba122b2b50bd9f373251df --- M scap/checks.yaml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/checks.yaml b/scap/checks.yaml index 596302d..58c77d4 100644 --- a/scap/checks.yaml +++ b/scap/checks.yaml @@ -7,6 +7,11 @@ type: nrpe stage: restart_service command: check_endpoints_restbase + delay: +type: command +stage: restart_service +command: sleep 50 +timeout: 60 repool: type: command stage: restart_service -- To view, visit https://gerrit.wikimedia.org/r/403395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37a412a4b90a5c77bcba122b2b50bd9f373251df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Checks: Wait a bit before repooling a server
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403395 ) Change subject: Checks: Wait a bit before repooling a server .. Checks: Wait a bit before repooling a server It takes approximately 45 seconds for each RESTBase process to start up, so wait for 50 seconds before repooling a server so as to have at least two workers running at that point. Change-Id: I37a412a4b90a5c77bcba122b2b50bd9f373251df --- M scap/checks.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/95/403395/1 diff --git a/scap/checks.yaml b/scap/checks.yaml index 596302d..58c77d4 100644 --- a/scap/checks.yaml +++ b/scap/checks.yaml @@ -7,6 +7,11 @@ type: nrpe stage: restart_service command: check_endpoints_restbase + delay: +type: command +stage: restart_service +command: sleep 50 +timeout: 60 repool: type: command stage: restart_service -- To view, visit https://gerrit.wikimedia.org/r/403395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37a412a4b90a5c77bcba122b2b50bd9f373251df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ad2b1b7
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403393 ) Change subject: Update restbase to ad2b1b7 .. Update restbase to ad2b1b7 List of changes: 576bb51 Fix duplicate pages in on this day results. 7fe2567 Fixes for failing tests. b902ce4 Use faster de-dupe method. c13582c Add missing semicolon. 7bcaa60 Recommendation API: Expand the route with article/creation/ 5856c2e Adds endpoint definition for pageviews by country ef7620c adds definition for content of countries array 1f01596 Rewrite URIs to HTTPS in summary thumbnails. ad2b1b7 Recursively change the URI protocol to the summary response Change-Id: I16b791d3f110f1c4b8bb2c275558f1c200267ed7 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index c530aa6..ad2b1b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit c530aa6d18b513aaa29b867643e2d6622d295317 +Subproject commit ad2b1b7ac8b25f7ca4c7f64ec9022330eaa824dc -- To view, visit https://gerrit.wikimedia.org/r/403393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16b791d3f110f1c4b8bb2c275558f1c200267ed7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ad2b1b7
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403393 ) Change subject: Update restbase to ad2b1b7 .. Update restbase to ad2b1b7 List of changes: 576bb51 Fix duplicate pages in on this day results. 7fe2567 Fixes for failing tests. b902ce4 Use faster de-dupe method. c13582c Add missing semicolon. 7bcaa60 Recommendation API: Expand the route with article/creation/ 5856c2e Adds endpoint definition for pageviews by country ef7620c adds definition for content of countries array 1f01596 Rewrite URIs to HTTPS in summary thumbnails. ad2b1b7 Recursively change the URI protocol to the summary response Change-Id: I16b791d3f110f1c4b8bb2c275558f1c200267ed7 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/93/403393/1 diff --git a/restbase b/restbase index c530aa6..ad2b1b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit c530aa6d18b513aaa29b867643e2d6622d295317 +Subproject commit ad2b1b7ac8b25f7ca4c7f64ec9022330eaa824dc -- To view, visit https://gerrit.wikimedia.org/r/403393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16b791d3f110f1c4b8bb2c275558f1c200267ed7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Remove legacy cluster nodes from deployment targets
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403211 ) Change subject: Scap: Remove legacy cluster nodes from deployment targets .. Scap: Remove legacy cluster nodes from deployment targets Bug: T184100 Change-Id: I79fdb715b55d027e578c186e6a2e82c546472076 --- M scap/targets 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/targets b/scap/targets index 7a8ee83..7231752 100644 --- a/scap/targets +++ b/scap/targets @@ -1,22 +1,10 @@ restbase1008.eqiad.wmnet restbase1009.eqiad.wmnet restbase1010.eqiad.wmnet -restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet -restbase1013.eqiad.wmnet restbase1014.eqiad.wmnet -restbase1015.eqiad.wmnet -restbase1016.eqiad.wmnet -restbase1017.eqiad.wmnet -restbase1018.eqiad.wmnet restbase2002.codfw.wmnet restbase2003.codfw.wmnet restbase2004.codfw.wmnet restbase2005.codfw.wmnet restbase2006.codfw.wmnet -restbase2007.codfw.wmnet -restbase2008.codfw.wmnet -restbase2009.codfw.wmnet -restbase2010.codfw.wmnet -restbase2011.codfw.wmnet -restbase2012.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/403211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79fdb715b55d027e578c186e6a2e82c546472076 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Remove legacy cluster nodes from deployment targets
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403211 ) Change subject: Scap: Remove legacy cluster nodes from deployment targets .. Scap: Remove legacy cluster nodes from deployment targets Bug: T184100 Change-Id: I79fdb715b55d027e578c186e6a2e82c546472076 --- M scap/targets 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/11/403211/1 diff --git a/scap/targets b/scap/targets index 7a8ee83..7231752 100644 --- a/scap/targets +++ b/scap/targets @@ -1,22 +1,10 @@ restbase1008.eqiad.wmnet restbase1009.eqiad.wmnet restbase1010.eqiad.wmnet -restbase1011.eqiad.wmnet restbase1012.eqiad.wmnet -restbase1013.eqiad.wmnet restbase1014.eqiad.wmnet -restbase1015.eqiad.wmnet -restbase1016.eqiad.wmnet -restbase1017.eqiad.wmnet -restbase1018.eqiad.wmnet restbase2002.codfw.wmnet restbase2003.codfw.wmnet restbase2004.codfw.wmnet restbase2005.codfw.wmnet restbase2006.codfw.wmnet -restbase2007.codfw.wmnet -restbase2008.codfw.wmnet -restbase2009.codfw.wmnet -restbase2010.codfw.wmnet -restbase2011.codfw.wmnet -restbase2012.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/403211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79fdb715b55d027e578c186e6a2e82c546472076 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back all of the targets
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403129 ) Change subject: Scap: Add back all of the targets .. Scap: Add back all of the targets Bug: T184110 Change-Id: If7d36aba0b606439f1767f2c8a946bbd1160f24c --- M scap/target-canary M scap/targets 2 files changed, 14 insertions(+), 2 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/target-canary b/scap/target-canary index a4aae46..2259262 100644 --- a/scap/target-canary +++ b/scap/target-canary @@ -1,2 +1,2 @@ -restbase2007.codfw.wmnet -restbase1011.eqiad.wmnet +restbase2001.codfw.wmnet +restbase1007.eqiad.wmnet diff --git a/scap/targets b/scap/targets index ba70b00..7a8ee83 100644 --- a/scap/targets +++ b/scap/targets @@ -1,8 +1,20 @@ +restbase1008.eqiad.wmnet +restbase1009.eqiad.wmnet +restbase1010.eqiad.wmnet +restbase1011.eqiad.wmnet +restbase1012.eqiad.wmnet restbase1013.eqiad.wmnet +restbase1014.eqiad.wmnet restbase1015.eqiad.wmnet restbase1016.eqiad.wmnet restbase1017.eqiad.wmnet restbase1018.eqiad.wmnet +restbase2002.codfw.wmnet +restbase2003.codfw.wmnet +restbase2004.codfw.wmnet +restbase2005.codfw.wmnet +restbase2006.codfw.wmnet +restbase2007.codfw.wmnet restbase2008.codfw.wmnet restbase2009.codfw.wmnet restbase2010.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/403129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7d36aba0b606439f1767f2c8a946bbd1160f24c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: RESTBase: Add LVS pools to the production_ng role
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403133 )
Change subject: RESTBase: Add LVS pools to the production_ng role
..
RESTBase: Add LVS pools to the production_ng role
Bug: T184110
Change-Id: Iab131a92465734f5933d4ee78e24eccfe7549209
---
M hieradata/role/common/restbase/production_ng.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/403133/1
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index c73e81b..8be132f 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -586,6 +586,10 @@
#
# General
#
+role::lvs::realserver::pools:
+ restbase: {}
+service::configuration::log_dir: "/var/log"
+
admin::groups:
- restbase-roots
- restbase-admins
--
To view, visit https://gerrit.wikimedia.org/r/403133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab131a92465734f5933d4ee78e24eccfe7549209
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Add back all of the targets
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403129 ) Change subject: Scap: Add back all of the targets .. Scap: Add back all of the targets Bug: T184110 Change-Id: If7d36aba0b606439f1767f2c8a946bbd1160f24c --- M scap/target-canary M scap/targets 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/29/403129/1 diff --git a/scap/target-canary b/scap/target-canary index a4aae46..2259262 100644 --- a/scap/target-canary +++ b/scap/target-canary @@ -1,2 +1,2 @@ -restbase2007.codfw.wmnet -restbase1011.eqiad.wmnet +restbase2001.codfw.wmnet +restbase1007.eqiad.wmnet diff --git a/scap/targets b/scap/targets index ba70b00..7a8ee83 100644 --- a/scap/targets +++ b/scap/targets @@ -1,8 +1,20 @@ +restbase1008.eqiad.wmnet +restbase1009.eqiad.wmnet +restbase1010.eqiad.wmnet +restbase1011.eqiad.wmnet +restbase1012.eqiad.wmnet restbase1013.eqiad.wmnet +restbase1014.eqiad.wmnet restbase1015.eqiad.wmnet restbase1016.eqiad.wmnet restbase1017.eqiad.wmnet restbase1018.eqiad.wmnet +restbase2002.codfw.wmnet +restbase2003.codfw.wmnet +restbase2004.codfw.wmnet +restbase2005.codfw.wmnet +restbase2006.codfw.wmnet +restbase2007.codfw.wmnet restbase2008.codfw.wmnet restbase2009.codfw.wmnet restbase2010.codfw.wmnet -- To view, visit https://gerrit.wikimedia.org/r/403129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7d36aba0b606439f1767f2c8a946bbd1160f24c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: RESTBase: Do not manage Cassandra 2 in the legacy cluster
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403122 )
Change subject: RESTBase: Do not manage Cassandra 2 in the legacy cluster
..
RESTBase: Do not manage Cassandra 2 in the legacy cluster
The legacy cluster is going to be decommissioned soon, so we don't need
to manage Cassandra on these nodes any longer. In contrast, we want to
keep RESTBase running on them until each of the nodes is reimaged.
Hence, remove profile::cassandra from the production role, but keep
profile::restbase.
Bug: T184100
Change-Id: If295d2f3192ac57c31819b3bb077bb2799eb0d36
---
M modules/role/manifests/restbase/production.pp
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/403122/1
diff --git a/modules/role/manifests/restbase/production.pp
b/modules/role/manifests/restbase/production.pp
index 3440df5..04097a8 100644
--- a/modules/role/manifests/restbase/production.pp
+++ b/modules/role/manifests/restbase/production.pp
@@ -3,7 +3,10 @@
# Configures the restbase dev cluster
class role::restbase::production {
# Just includes base, no LVS etc.
-include ::role::restbase::base
+include ::passwords::cassandra
+include ::base::firewall
+include ::standard
+include ::profile::restbase
include ::role::lvs::realserver
-system::role { 'restbase': description => 'Restbase (production)' }
+system::role { 'restbase': description => 'Restbase (production, Cass
2.2.x)' }
}
--
To view, visit https://gerrit.wikimedia.org/r/403122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If295d2f3192ac57c31819b3bb077bb2799eb0d36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Switch summary to use MCS in all environments
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402825 ) Change subject: Config: Switch summary to use MCS in all environments .. Config: Switch summary to use MCS in all environments Depends on https://github.com/wikimedia/restbase/pull/938 being merged. Bug: T179875 Change-Id: Ic945382c83c15880b344499d009d8950fda55770 --- M scap/environments/beta/vars.yaml M scap/vars.yaml 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/25/402825/1 diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index 8b30741..e5a04d3 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -4,7 +4,6 @@ user_agent: RESTBase/deployment-prep storage_groups_ng: [] cassandra_default_consistency: localOne -summary_impl: mcs domains: BetaCluster: aa.wikipedia.beta.wmflabs.org: default_project diff --git a/scap/vars.yaml b/scap/vars.yaml index 7a728cb..f0a09fe 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -30,6 +30,7 @@ pdfrender_key: secret cxserver_uri: https://cxserver-beta.wmflabs.org aqs_uri: https://wikimedia.org/api/rest_v1/metrics +summary_impl: mcs delete_probability: 0.25 port: 7231 salt_key: '123456' @@ -44,7 +45,6 @@ domains: /^wikimedia\.org$/ - name: wikipedia domains: /\.wikipedia\.org$/ -summary_impl: mwapi domains: Wikipedia: ab.wikipedia.org: default_project -- To view, visit https://gerrit.wikimedia.org/r/402825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic945382c83c15880b344499d009d8950fda55770 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Define the protocol for links contained in page summary
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/402818 ) Change subject: Config: Define the protocol for links contained in page summary .. Config: Define the protocol for links contained in page summary Previously, the protocol for links and images served by the page summary end point was hard-coded to `https`. https://github.com/wikimedia/restbase/pull/938 allows the administrator to change that. Hence, set the protocol in the config to `https` so as not to change the output once PR #938 gets merged and deployed. Bug: T179875 Change-Id: I42d5b4e082d3f7a7865703c4f63b2cf17f6495af --- M scap/templates/config.yaml.j2 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 21a3524..58503f4 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -102,6 +102,7 @@ summary: host: <%= mobileapps_uri %> implementation: <%= summary_impl %> + protocol: https related: cache_control: s-maxage=86400, max-age=3600 # Cache headers for purged end points. -- To view, visit https://gerrit.wikimedia.org/r/402818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42d5b4e082d3f7a7865703c4f63b2cf17f6495af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Define the protocol for links contained in page summary
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402818 ) Change subject: Config: Define the protocol for links contained in page summary .. Config: Define the protocol for links contained in page summary Previously, the protocol for links and images served by the page summary end point was hard-coded to `https`. https://github.com/wikimedia/restbase/pull/938 allows the administrator to change that. Hence, set the protocol in the config to `https` so as not to change the output once PR #938 gets merged and deployed. Bug: T179875 Change-Id: I42d5b4e082d3f7a7865703c4f63b2cf17f6495af --- M scap/templates/config.yaml.j2 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/18/402818/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 21a3524..58503f4 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -102,6 +102,7 @@ summary: host: <%= mobileapps_uri %> implementation: <%= summary_impl %> + protocol: https related: cache_control: s-maxage=86400, max-age=3600 # Cache headers for purged end points. -- To view, visit https://gerrit.wikimedia.org/r/402818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42d5b4e082d3f7a7865703c4f63b2cf17f6495af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Remove references for Cassandra 2
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402035 )
Change subject: Config: Remove references for Cassandra 2
..
Config: Remove references for Cassandra 2
Bug: T179419
Change-Id: Ibdb1b31ec4d1e54a3c630820d7aa4c43cf1e78ea
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 1 insertion(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/35/402035/1
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index c81c54a..8b30741 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -2,7 +2,6 @@
salt_key: '123456'
page_size: 10
user_agent: RESTBase/deployment-prep
-storage_groups: []
storage_groups_ng: []
cassandra_default_consistency: localOne
summary_impl: mcs
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 801b8fd..21a3524 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -53,27 +53,6 @@
x-modules:
- path: projects/wmf_default.yaml
options: &default_options
-table:
- backend: cassandra
- hosts: ['<%= seeds|join("','") %>']
- keyspace: system
- localDc: <%= cassandra_local_dc %>
- datacenters: ['<%= cassandra_datacenters|join("','") %>']
- username: <%= cassandra_user %>
- password: <%= cassandra_password %>
- defaultConsistency: <%= cassandra_default_consistency %>
- <% if cassandra_tls is not none and cassandra_tls|length > 0
%>tls:<% for key, value in cassandra_tls.iteritems() %>
-<%= key %>: <%= value -%>
-<% endfor -%>
-<% endif %>
- storage_groups:
- <%- for group in storage_groups %>
-- name: <%= group.name %>
- domains: <%= group.domains %>
- <%- endfor %>
-# Catch-all group
-- name: default.group.local
- domains: /./
table_ng:
backend: cassandra-ng
hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else
seeds|join("','") %>']
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 521d1aa..7a728cb 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -12,7 +12,7 @@
mwapi_uri: http://localhost/w/api.php
ipaddress: '127.0.0.1'
rl_seeds: []
-seeds: ['localhost']
+seeds_ng: ['localhost']
cassandra_local_dc: testdc
cassandra_datacenters: ['testdc']
cassandra_user: cassandra
@@ -35,29 +35,6 @@
salt_key: '123456'
page_size: 10
user_agent: RESTBase/WMF
-storage_groups:
- - name: phase0.group.local
-domains: /^(?:test.*\.wiki.*\.org|www.mediawiki.org)$/
- - name: wikipedia.group.local
-domains: /\.wikipedia\.org$/
- - name: wikimedia.group.local
-domains: /\.wikimedia\.org$/
- - name: wiktionary.group.local
-domains: /\.wiktionary\.org$/
- - name: wikibooks.group.local
-domains: /\.wikibooks\.org$/
- - name: wikisource.group.local
-domains: /\.wikisource\.org$/
- - name: wikiquote.group.local
-domains: /\.wikiquote\.org$/
- - name: wikinews.group.local
-domains: /\.wikinews\.org$/
- - name: wikiversity.group.local
-domains: /\.wikiversity\.org$/
- - name: wikivoyage.group.local
-domains: /\.wikivoyage\.org$/
- - name: globaldomain.group.local
-domains: /^wikimedia\.org$/
storage_groups_ng:
- name: enwiki
domains: /^en\.wikipedia\.org$/
--
To view, visit https://gerrit.wikimedia.org/r/402035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdb1b31ec4d1e54a3c630820d7aa4c43cf1e78ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Remove references for Cassandra 2
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402035 )
Change subject: Config: Remove references for Cassandra 2
..
Config: Remove references for Cassandra 2
Bug: T179419
Change-Id: Ibdb1b31ec4d1e54a3c630820d7aa4c43cf1e78ea
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 1 insertion(+), 46 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index c81c54a..8b30741 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -2,7 +2,6 @@
salt_key: '123456'
page_size: 10
user_agent: RESTBase/deployment-prep
-storage_groups: []
storage_groups_ng: []
cassandra_default_consistency: localOne
summary_impl: mcs
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 801b8fd..21a3524 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -53,27 +53,6 @@
x-modules:
- path: projects/wmf_default.yaml
options: &default_options
-table:
- backend: cassandra
- hosts: ['<%= seeds|join("','") %>']
- keyspace: system
- localDc: <%= cassandra_local_dc %>
- datacenters: ['<%= cassandra_datacenters|join("','") %>']
- username: <%= cassandra_user %>
- password: <%= cassandra_password %>
- defaultConsistency: <%= cassandra_default_consistency %>
- <% if cassandra_tls is not none and cassandra_tls|length > 0
%>tls:<% for key, value in cassandra_tls.iteritems() %>
-<%= key %>: <%= value -%>
-<% endfor -%>
-<% endif %>
- storage_groups:
- <%- for group in storage_groups %>
-- name: <%= group.name %>
- domains: <%= group.domains %>
- <%- endfor %>
-# Catch-all group
-- name: default.group.local
- domains: /./
table_ng:
backend: cassandra-ng
hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else
seeds|join("','") %>']
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 521d1aa..7a728cb 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -12,7 +12,7 @@
mwapi_uri: http://localhost/w/api.php
ipaddress: '127.0.0.1'
rl_seeds: []
-seeds: ['localhost']
+seeds_ng: ['localhost']
cassandra_local_dc: testdc
cassandra_datacenters: ['testdc']
cassandra_user: cassandra
@@ -35,29 +35,6 @@
salt_key: '123456'
page_size: 10
user_agent: RESTBase/WMF
-storage_groups:
- - name: phase0.group.local
-domains: /^(?:test.*\.wiki.*\.org|www.mediawiki.org)$/
- - name: wikipedia.group.local
-domains: /\.wikipedia\.org$/
- - name: wikimedia.group.local
-domains: /\.wikimedia\.org$/
- - name: wiktionary.group.local
-domains: /\.wiktionary\.org$/
- - name: wikibooks.group.local
-domains: /\.wikibooks\.org$/
- - name: wikisource.group.local
-domains: /\.wikisource\.org$/
- - name: wikiquote.group.local
-domains: /\.wikiquote\.org$/
- - name: wikinews.group.local
-domains: /\.wikinews\.org$/
- - name: wikiversity.group.local
-domains: /\.wikiversity\.org$/
- - name: wikivoyage.group.local
-domains: /\.wikivoyage\.org$/
- - name: globaldomain.group.local
-domains: /^wikimedia\.org$/
storage_groups_ng:
- name: enwiki
domains: /^en\.wikipedia\.org$/
--
To view, visit https://gerrit.wikimedia.org/r/402035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdb1b31ec4d1e54a3c630820d7aa4c43cf1e78ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to c530aa6
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/402031 ) Change subject: Update restbase to c530aa6 .. Update restbase to c530aa6 List of changes: 6a21f1c Mathoid: Switch to new storage 136f908 Clean up: Remove code and config pertaining to Cassandra 2 3c13fa3 Bug fix: Mathoid: Add the `_ng` suffix to bucket names c530aa6 Remove the restbase-mod-table-sqlite dependency xxx Update node module dependencies Change-Id: I340832c76a782be20427e89aa09dea251e1880ef --- M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json M node_modules/bluebird/package.json M node_modules/cassandra-driver/package.json M node_modules/cassandra-uuid/package.json M node_modules/content-type/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/core-js/library/modules/es6.symbol.js M node_modules/core-js/library/modules/es7.observable.js M node_modules/core-js/library/modules/es7.string.pad-end.js M node_modules/core-js/library/modules/es7.string.pad-start.js M node_modules/core-js/library/modules/web.timers.js M node_modules/core-js/library/stage/2.js M node_modules/core-js/modules/_core.js M node_modules/core-js/modules/_iter-define.js M node_modules/core-js/modules/_microtask.js M node_modules/core-js/modules/_partial.js M node_modules/core-js/modules/_set-collection-of.js M node_modules/core-js/modules/_typed-buffer.js A node_modules/core-js/modules/_user-agent.js M node_modules/core-js/modules/es6.array.slice.js M node_modules/core-js/modules/es6.promise.js M node_modules/core-js/modules/es6.symbol.js M node_modules/core-js/modules/es7.observable.js M node_modules/core-js/modules/es7.string.pad-end.js M node_modules/core-js/modules/es7.string.pad-start.js M node_modules/core-js/modules/web.timers.js M node_modules/core-js/package.json M node_modules/core-js/stage/2.js M node_modules/extend/package.json M node_modules/js-yaml/package.json M node_modules/json-stable-stringify/package.json M node_modules/kad/package.json M node_modules/moment/locale/af.js M node_modules/moment/locale/ar-dz.js M node_modules/moment/locale/ar-kw.js M node_modules/moment/locale/ar-ly.js M node_modules/moment/locale/ar-ma.js M node_modules/moment/locale/ar-sa.js M node_modules/moment/locale/ar-tn.js M node_modules/moment/locale/ar.js M node_modules/moment/locale/az.js M node_modules/moment/locale/be.js M node_modules/moment/locale/bg.js M node_modules/moment/locale/bm.js M node_modules/moment/locale/bn.js M node_modules/moment/locale/bo.js M node_modules/moment/locale/br.js M node_modules/moment/locale/bs.js M node_modules/moment/locale/ca.js M node_modules/moment/locale/cs.js M node_modules/moment/locale/cv.js M node_modules/moment/locale/cy.js M node_modules/moment/locale/da.js M node_modules/moment/locale/de-at.js M node_modules/moment/locale/de-ch.js M node_modules/moment/locale/de.js M node_modules/moment/locale/dv.js M node_modules/moment/locale/el.js M node_modules/moment/locale/en-au.js M node_modules/moment/locale/en-ca.js M node_modules/moment/locale/en-gb.js M node_modules/moment/locale/en-ie.js M node_modules/moment/locale/en-nz.js M node_modules/moment/locale/eo.js M node_modules/moment/locale/es-do.js M node_modules/moment/locale/es-us.js M node_modules/moment/locale/es.js M node_modules/moment/locale/et.js M node_modules/moment/locale/eu.js M node_modules/moment/locale/fa.js M node_modules/moment/locale/fi.js M node_modules/moment/locale/fo.js M node_modules/moment/locale/fr-ca.js M node_modules/moment/locale/fr-ch.js M node_modules/moment/locale/fr.js M node_modules/moment/locale/fy.js M node_modules/moment/locale/gd.js M node_modules/moment/locale/gl.js M node_modules/moment/locale/gom-latn.js M node_modules/moment/locale/gu.js M node_modules/moment/locale/he.js M node_modules/moment/locale/hi.js M node_modules/moment/locale/hr.js M node_modules/moment/locale/hu.js M node_modules/moment/local
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to c530aa6
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402031 ) Change subject: Update restbase to c530aa6 .. Update restbase to c530aa6 List of changes: 6a21f1c Mathoid: Switch to new storage 136f908 Clean up: Remove code and config pertaining to Cassandra 2 3c13fa3 Bug fix: Mathoid: Add the `_ng` suffix to bucket names c530aa6 Remove the restbase-mod-table-sqlite dependency xxx Update node module dependencies Change-Id: I340832c76a782be20427e89aa09dea251e1880ef --- M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json M node_modules/bluebird/package.json M node_modules/cassandra-driver/package.json M node_modules/cassandra-uuid/package.json M node_modules/content-type/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/core-js/library/modules/es6.symbol.js M node_modules/core-js/library/modules/es7.observable.js M node_modules/core-js/library/modules/es7.string.pad-end.js M node_modules/core-js/library/modules/es7.string.pad-start.js M node_modules/core-js/library/modules/web.timers.js M node_modules/core-js/library/stage/2.js M node_modules/core-js/modules/_core.js M node_modules/core-js/modules/_iter-define.js M node_modules/core-js/modules/_microtask.js M node_modules/core-js/modules/_partial.js M node_modules/core-js/modules/_set-collection-of.js M node_modules/core-js/modules/_typed-buffer.js A node_modules/core-js/modules/_user-agent.js M node_modules/core-js/modules/es6.array.slice.js M node_modules/core-js/modules/es6.promise.js M node_modules/core-js/modules/es6.symbol.js M node_modules/core-js/modules/es7.observable.js M node_modules/core-js/modules/es7.string.pad-end.js M node_modules/core-js/modules/es7.string.pad-start.js M node_modules/core-js/modules/web.timers.js M node_modules/core-js/package.json M node_modules/core-js/stage/2.js M node_modules/extend/package.json M node_modules/js-yaml/package.json M node_modules/json-stable-stringify/package.json M node_modules/kad/package.json M node_modules/moment/locale/af.js M node_modules/moment/locale/ar-dz.js M node_modules/moment/locale/ar-kw.js M node_modules/moment/locale/ar-ly.js M node_modules/moment/locale/ar-ma.js M node_modules/moment/locale/ar-sa.js M node_modules/moment/locale/ar-tn.js M node_modules/moment/locale/ar.js M node_modules/moment/locale/az.js M node_modules/moment/locale/be.js M node_modules/moment/locale/bg.js M node_modules/moment/locale/bm.js M node_modules/moment/locale/bn.js M node_modules/moment/locale/bo.js M node_modules/moment/locale/br.js M node_modules/moment/locale/bs.js M node_modules/moment/locale/ca.js M node_modules/moment/locale/cs.js M node_modules/moment/locale/cv.js M node_modules/moment/locale/cy.js M node_modules/moment/locale/da.js M node_modules/moment/locale/de-at.js M node_modules/moment/locale/de-ch.js M node_modules/moment/locale/de.js M node_modules/moment/locale/dv.js M node_modules/moment/locale/el.js M node_modules/moment/locale/en-au.js M node_modules/moment/locale/en-ca.js M node_modules/moment/locale/en-gb.js M node_modules/moment/locale/en-ie.js M node_modules/moment/locale/en-nz.js M node_modules/moment/locale/eo.js M node_modules/moment/locale/es-do.js M node_modules/moment/locale/es-us.js M node_modules/moment/locale/es.js M node_modules/moment/locale/et.js M node_modules/moment/locale/eu.js M node_modules/moment/locale/fa.js M node_modules/moment/locale/fi.js M node_modules/moment/locale/fo.js M node_modules/moment/locale/fr-ca.js M node_modules/moment/locale/fr-ch.js M node_modules/moment/locale/fr.js M node_modules/moment/locale/fy.js M node_modules/moment/locale/gd.js M node_modules/moment/locale/gl.js M node_modules/moment/locale/gom-latn.js M node_modules/moment/locale/gu.js M node_modules/moment/locale/he.js M node_modules/moment/locale/hi.js M node_modules/moment/locale/hr.js M node_modules/moment/locale/hu.js M node_modules/moment/locale/hy-am.
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e7f6b7
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402030 ) Change subject: Update restbase to 2e7f6b7 .. Update restbase to 2e7f6b7 List of changes: xxx Update node module dependencies Change-Id: I8deb25990b42bd4cc157e0157c1cd324aec094a9 --- M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/package.json M node_modules/content-type/package.json M node_modules/core-js/bower.json M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/library/modules/_core.js M node_modules/core-js/library/modules/_iter-define.js M node_modules/core-js/library/modules/_microtask.js M node_modules/core-js/library/modules/_partial.js M node_modules/core-js/library/modules/_set-collection-of.js M node_modules/core-js/library/modules/_typed-buffer.js A node_modules/core-js/library/modules/_user-agent.js M node_modules/core-js/library/modules/es6.array.slice.js M node_modules/core-js/library/modules/es6.promise.js M node_modules/core-js/library/modules/es6.symbol.js M node_modules/core-js/library/modules/es7.observable.js M node_modules/core-js/library/modules/es7.string.pad-end.js M node_modules/core-js/library/modules/es7.string.pad-start.js M node_modules/core-js/library/modules/web.timers.js M node_modules/core-js/library/stage/2.js M node_modules/core-js/modules/_core.js M node_modules/core-js/modules/_iter-define.js M node_modules/core-js/modules/_microtask.js M node_modules/core-js/modules/_partial.js M node_modules/core-js/modules/_set-collection-of.js M node_modules/core-js/modules/_typed-buffer.js A node_modules/core-js/modules/_user-agent.js M node_modules/core-js/modules/es6.array.slice.js M node_modules/core-js/modules/es6.promise.js M node_modules/core-js/modules/es6.symbol.js M node_modules/core-js/modules/es7.observable.js M node_modules/core-js/modules/es7.string.pad-end.js M node_modules/core-js/modules/es7.string.pad-start.js M node_modules/core-js/modules/web.timers.js M node_modules/core-js/package.json M node_modules/core-js/stage/2.js M node_modules/json-stable-stringify/package.json M node_modules/kad/package.json M node_modules/moment/locale/af.js M node_modules/moment/locale/ar-dz.js M node_modules/moment/locale/ar-kw.js M node_modules/moment/locale/ar-ly.js M node_modules/moment/locale/ar-ma.js M node_modules/moment/locale/ar-sa.js M node_modules/moment/locale/ar-tn.js M node_modules/moment/locale/ar.js M node_modules/moment/locale/az.js M node_modules/moment/locale/be.js M node_modules/moment/locale/bg.js M node_modules/moment/locale/bm.js M node_modules/moment/locale/bn.js M node_modules/moment/locale/bo.js M node_modules/moment/locale/br.js M node_modules/moment/locale/bs.js M node_modules/moment/locale/ca.js M node_modules/moment/locale/cs.js M node_modules/moment/locale/cv.js M node_modules/moment/locale/cy.js M node_modules/moment/locale/da.js M node_modules/moment/locale/de-at.js M node_modules/moment/locale/de-ch.js M node_modules/moment/locale/de.js M node_modules/moment/locale/dv.js M node_modules/moment/locale/el.js M node_modules/moment/locale/en-au.js M node_modules/moment/locale/en-ca.js M node_modules/moment/locale/en-gb.js M node_modules/moment/locale/en-ie.js M node_modules/moment/locale/en-nz.js M node_modules/moment/locale/eo.js M node_modules/moment/locale/es-do.js M node_modules/moment/locale/es-us.js M node_modules/moment/locale/es.js M node_modules/moment/locale/et.js M node_modules/moment/locale/eu.js M node_modules/moment/locale/fa.js M node_modules/moment/locale/fi.js M node_modules/moment/locale/fo.js M node_modules/moment/locale/fr-ca.js M node_modules/moment/locale/fr-ch.js M node_modules/moment/locale/fr.js M node_modules/moment/locale/fy.js M node_modules/moment/locale/gd.js M node_modules/moment/locale/gl.js M node_modules/moment/locale/gom-latn.js M node_modules/moment/locale/gu.js M node_modules/moment/locale/he.js M node_modules/moment/locale/hi.js M node_modules/moment/locale/hr.js M node_modules/moment/locale/hu.js M node_modules/moment/locale/hy-am.js M node_modules/moment/locale/id.js M node_modules/moment/locale/is.js M node_modules/moment/locale/it.js M node_modules/moment/locale/ja.js M node_modules/moment/locale/jv.js M node_modules/moment/locale/ka.js M node_modules/moment/locale/kk.js M node_modules/moment/locale/km.js M node_modules/moment/locale/kn.js M node_modules/moment/locale/ky.js M node_modules/moment/locale/lb.js M node_modules/moment/locale/lo.j
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to 54e0e5527
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402006 )
Change subject: Update mathoid to 54e0e5527
..
Update mathoid to 54e0e5527
List of changes:
54e0e5527 Require texvcinfo v0.5.2 and release v0.7.1
xxx Update node module dependencies
Change-Id: Iccf713d24e16877c8f35f37473aedaa3e948ef8e
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/package.json
M src
4 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index e07d9da..3cefaab 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "cffb35582d9f2ce2d2bc4fac01dd14e94361da98",
+ "_shasum": "1ec8e6298e92e0d3eaf73cedad8d4ed03f05f68c",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index 33d7d09..83ac9e5 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "89fb36bbe3f6f65d079b8024e6c017c2b07b58e5",
+ "_shasum": "d94c44b4eb0c9e6953174266b6f9684bf73982d5",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/texvcinfo/package.json
b/node_modules/texvcinfo/package.json
index eaad57e..746e621 100644
--- a/node_modules/texvcinfo/package.json
+++ b/node_modules/texvcinfo/package.json
@@ -2,18 +2,18 @@
"_args": [
[
{
-"raw": "texvcinfo@^0.5.1",
+"raw": "texvcinfo@^0.5.2",
"scope": null,
"escapedName": "texvcinfo",
"name": "texvcinfo",
-"rawSpec": "^0.5.1",
-"spec": ">=0.5.1 <0.6.0",
+"rawSpec": "^0.5.2",
+"spec": ">=0.5.2 <0.6.0",
"type": "range"
},
"/opt/service"
]
],
- "_from": "texvcinfo@>=0.5.1 <0.6.0",
+ "_from": "texvcinfo@>=0.5.2 <0.6.0",
"_id": "texvcinfo@0.5.2",
"_inCache": true,
"_location": "/texvcinfo",
@@ -29,12 +29,12 @@
"_npmVersion": "3.10.10",
"_phantomChildren": {},
"_requested": {
-"raw": "texvcinfo@^0.5.1",
+"raw": "texvcinfo@^0.5.2",
"scope": null,
"escapedName": "texvcinfo",
"name": "texvcinfo",
-"rawSpec": "^0.5.1",
-"spec": ">=0.5.1 <0.6.0",
+"rawSpec": "^0.5.2",
+"spec": ">=0.5.2 <0.6.0",
"type": "range"
},
"_requiredBy": [
@@ -43,7 +43,7 @@
"_resolved": "https://registry.npmjs.org/texvcinfo/-/texvcinfo-0.5.2.tgz";,
"_shasum": "5da6bcaeac9af9e0a41a59d3d58684dfafae0008",
"_shrinkwrap": null,
- "_spec": "texvcinfo@^0.5.1",
+ "_spec": "texvcinfo@^0.5.2",
"_where": "/opt/service",
"bin": {
"texvcinfo": "./bin/texvcinfo"
diff --git a/src b/src
index bad5ec8..54e0e55 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit bad5ec8d4a287cc70160a4776ecc112e23dc6145
+Subproject commit 54e0e55278d5af75f63cb161278d1727a53f1665
--
To view, visit https://gerrit.wikimedia.org/r/402006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iccf713d24e16877c8f35f37473aedaa3e948ef8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to 54e0e5527
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402006 )
Change subject: Update mathoid to 54e0e5527
..
Update mathoid to 54e0e5527
List of changes:
54e0e5527 Require texvcinfo v0.5.2 and release v0.7.1
xxx Update node module dependencies
Change-Id: Iccf713d24e16877c8f35f37473aedaa3e948ef8e
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/package.json
M src
4 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy
refs/changes/06/402006/1
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index e07d9da..3cefaab 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "cffb35582d9f2ce2d2bc4fac01dd14e94361da98",
+ "_shasum": "1ec8e6298e92e0d3eaf73cedad8d4ed03f05f68c",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index 33d7d09..83ac9e5 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "89fb36bbe3f6f65d079b8024e6c017c2b07b58e5",
+ "_shasum": "d94c44b4eb0c9e6953174266b6f9684bf73982d5",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/texvcinfo/package.json
b/node_modules/texvcinfo/package.json
index eaad57e..746e621 100644
--- a/node_modules/texvcinfo/package.json
+++ b/node_modules/texvcinfo/package.json
@@ -2,18 +2,18 @@
"_args": [
[
{
-"raw": "texvcinfo@^0.5.1",
+"raw": "texvcinfo@^0.5.2",
"scope": null,
"escapedName": "texvcinfo",
"name": "texvcinfo",
-"rawSpec": "^0.5.1",
-"spec": ">=0.5.1 <0.6.0",
+"rawSpec": "^0.5.2",
+"spec": ">=0.5.2 <0.6.0",
"type": "range"
},
"/opt/service"
]
],
- "_from": "texvcinfo@>=0.5.1 <0.6.0",
+ "_from": "texvcinfo@>=0.5.2 <0.6.0",
"_id": "texvcinfo@0.5.2",
"_inCache": true,
"_location": "/texvcinfo",
@@ -29,12 +29,12 @@
"_npmVersion": "3.10.10",
"_phantomChildren": {},
"_requested": {
-"raw": "texvcinfo@^0.5.1",
+"raw": "texvcinfo@^0.5.2",
"scope": null,
"escapedName": "texvcinfo",
"name": "texvcinfo",
-"rawSpec": "^0.5.1",
-"spec": ">=0.5.1 <0.6.0",
+"rawSpec": "^0.5.2",
+"spec": ">=0.5.2 <0.6.0",
"type": "range"
},
"_requiredBy": [
@@ -43,7 +43,7 @@
"_resolved": "https://registry.npmjs.org/texvcinfo/-/texvcinfo-0.5.2.tgz";,
"_shasum": "5da6bcaeac9af9e0a41a59d3d58684dfafae0008",
"_shrinkwrap": null,
- "_spec": "texvcinfo@^0.5.1",
+ "_spec": "texvcinfo@^0.5.2",
"_where": "/opt/service",
"bin": {
"texvcinfo": "./bin/texvcinfo"
diff --git a/src b/src
index bad5ec8..54e0e55 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit bad5ec8d4a287cc70160a4776ecc112e23dc6145
+Subproject commit 54e0e55278d5af75f63cb161278d1727a53f1665
--
To view, visit https://gerrit.wikimedia.org/r/402006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccf713d24e16877c8f35f37473aedaa3e948ef8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Require texvcinfo v0.5.2 and release v0.7.1
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401936 )
Change subject: Require texvcinfo v0.5.2 and release v0.7.1
..
Require texvcinfo v0.5.2 and release v0.7.1
Bug: T172767
Change-Id: I8347aeb2a8b365cd21cc6de3b06139c89206348e
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 7c323ee..a920d22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mathoid",
- "version": "0.7.0",
+ "version": "0.7.1",
"content-version": "1.0.0",
"description": "Render TeX to SVG and MathML using MathJax. Based on
svgtex.",
"main": "./app.js",
@@ -58,7 +58,7 @@
"svgo": "^0.7.1",
"swagger-router": "^0.7.1",
"swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master";,
-"texvcinfo": "^0.5.1"
+"texvcinfo": "^0.5.2"
},
"optionalDependencies": {
"librsvg": "^0.7.0"
--
To view, visit https://gerrit.wikimedia.org/r/401936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8347aeb2a8b365cd21cc6de3b06139c89206348e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Physikerwelt
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...mathoid[master]: Require texvcinfo v0.5.2 and release v0.7.1
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401936 )
Change subject: Require texvcinfo v0.5.2 and release v0.7.1
..
Require texvcinfo v0.5.2 and release v0.7.1
Bug: T172767
Change-Id: I8347aeb2a8b365cd21cc6de3b06139c89206348e
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid
refs/changes/36/401936/1
diff --git a/package.json b/package.json
index 7c323ee..a920d22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mathoid",
- "version": "0.7.0",
+ "version": "0.7.1",
"content-version": "1.0.0",
"description": "Render TeX to SVG and MathML using MathJax. Based on
svgtex.",
"main": "./app.js",
@@ -58,7 +58,7 @@
"svgo": "^0.7.1",
"swagger-router": "^0.7.1",
"swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master";,
-"texvcinfo": "^0.5.1"
+"texvcinfo": "^0.5.2"
},
"optionalDependencies": {
"librsvg": "^0.7.0"
--
To view, visit https://gerrit.wikimedia.org/r/401936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8347aeb2a8b365cd21cc6de3b06139c89206348e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401926 ) Change subject: Update mathoid to bad5ec8d4 .. Update mathoid to bad5ec8d4 List of changes: xxx Update node module dependencies Change-Id: I8f8a682834a1dc0026f671736f3b5eca7c90f247 --- A node_modules/.bin/texvcinfo M node_modules/.bin/texvcjs M node_modules/commander/package.json M node_modules/kad/package.json R node_modules/mathoid-texvcjs/.istanbul.yml R node_modules/mathoid-texvcjs/.jshintignore R node_modules/mathoid-texvcjs/.jshintrc R node_modules/mathoid-texvcjs/.npmignore R node_modules/mathoid-texvcjs/.travis.yml R node_modules/mathoid-texvcjs/bin/texvcjs R node_modules/mathoid-texvcjs/lib/ast.js R node_modules/mathoid-texvcjs/lib/astutil.js R node_modules/mathoid-texvcjs/lib/build-parser.js R node_modules/mathoid-texvcjs/lib/index.js R node_modules/mathoid-texvcjs/lib/parser.js R node_modules/mathoid-texvcjs/lib/parser.pegjs R node_modules/mathoid-texvcjs/lib/render.js R node_modules/mathoid-texvcjs/lib/texutil.js R node_modules/mathoid-texvcjs/package.json R node_modules/mathoid-texvcjs/test/all.js R node_modules/mathoid-texvcjs/test/api.js R node_modules/mathoid-texvcjs/test/ast.js R node_modules/mathoid-texvcjs/test/chem-regression.js R node_modules/mathoid-texvcjs/test/chem-regression.json R node_modules/mathoid-texvcjs/test/chemtest.tex R node_modules/mathoid-texvcjs/test/contains.js R node_modules/mathoid-texvcjs/test/en-wiki-formulae.js R node_modules/mathoid-texvcjs/test/en-wiki-formulae.json R node_modules/mathoid-texvcjs/test/mathjax-texvc.js R node_modules/mathoid-texvcjs/test/mathjax-texvc.json R node_modules/mathoid-texvcjs/test/mocha.opts R node_modules/mathoid-texvcjs/test/parser.js R node_modules/mathoid-texvcjs/test/render.js M node_modules/swagger-ui/package.json M node_modules/texvcinfo/.codeclimate.yml M node_modules/texvcinfo/.eslintignore M node_modules/texvcinfo/.eslintrc M node_modules/texvcinfo/.jshintignore M node_modules/texvcinfo/.jshintrc M node_modules/texvcinfo/.npmignore M node_modules/texvcinfo/.travis.yml M node_modules/texvcinfo/doc/commands.tex M node_modules/texvcinfo/doc/literals.tex M node_modules/texvcinfo/doc/main.pdf M node_modules/texvcinfo/doc/main.tex M node_modules/texvcinfo/lib/arrayTree.js M node_modules/texvcinfo/lib/d3json.js M node_modules/texvcinfo/lib/extractors/mods.js M node_modules/texvcinfo/lib/extractors/subscripts.js M node_modules/texvcinfo/lib/feedback.js M node_modules/texvcinfo/lib/flatList.js M node_modules/texvcinfo/lib/identifier.js M node_modules/texvcinfo/lib/index.js M node_modules/texvcinfo/lib/letterMods.json M node_modules/texvcinfo/lib/literals.json M node_modules/texvcinfo/lib/tokenTypes.js D node_modules/texvcinfo/node_modules/.bin/texvcjs M node_modules/texvcinfo/package.json M node_modules/texvcinfo/test/feedback.js M node_modules/texvcinfo/test/gold.js M node_modules/texvcinfo/test/goldData.js M node_modules/texvcinfo/test/identifier.js M node_modules/texvcinfo/test/index.js M node_modules/texvcinfo/test/mocha.opts M node_modules/texvcinfo/test/tokenizer.js M node_modules/texvcinfo/test/tree2d3json.js M node_modules/texvcinfo/test/treeWriter.js M node_modules/texvcinfo/utils/createDoc.js M node_modules/texvcinfo/vis/index.html 69 files changed, 106 insertions(+), 95 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/node_modules/.bin/texvcinfo b/node_modules/.bin/texvcinfo new file mode 12 index 000..c04501a --- /dev/null +++ b/node_modules/.bin/texvcinfo @@ -0,0 +1 @@ +../texvcinfo/bin/texvcinfo \ No newline at end of file diff --git a/node_modules/.bin/texvcjs b/node_modules/.bin/texvcjs index c04501a..5f7e9a4 12 --- a/node_modules/.bin/texvcjs +++ b/node_modules/.bin/texvcjs @@ -1 +1 @@ -../texvcinfo/bin/texvcinfo \ No newline at end of file +../mathoid-texvcjs/bin/texvcjs \ No newline at end of file diff --git a/node_modules/commander/package.json b/node_modules/commander/package.json index 24a31d7..9d7038b 100644 --- a/node_modules/commander/package.json +++ b/node_modules/commander/package.json @@ -39,9 +39,9 @@ }, "_requiredBy": [ "#DEV:/", +"/mathoid-texvcjs", "/speech-rule-engine", -"/texvcinfo", -"/texvcinfo/mathoid-texvcjs" +"/texvcinfo" ], "_resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";, "_shasum": "0f5946c427ed9ec0d91a46bb9def53e54650e555", diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json index 5d8d870..e07d9da 100644 --- a/node_modules/kad/package.json +++ b/node_modules/kad/package.json @@ -49,7 +49,7 @@ "/limitation" ], "_resolved": "git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";, - "_shasum": "6def549a4e39b5cbb43e008cf91234548769407f", + "_shasum": "cffb35582d9f2ce2d2bc4fac01dd14e94361da98", "_shrinkwrap": null, "_spec": "kad@git+http
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401926 ) Change subject: Update mathoid to bad5ec8d4 .. Update mathoid to bad5ec8d4 List of changes: xxx Update node module dependencies Change-Id: I8f8a682834a1dc0026f671736f3b5eca7c90f247 --- A node_modules/.bin/texvcinfo M node_modules/.bin/texvcjs M node_modules/commander/package.json M node_modules/kad/package.json R node_modules/mathoid-texvcjs/.istanbul.yml R node_modules/mathoid-texvcjs/.jshintignore R node_modules/mathoid-texvcjs/.jshintrc R node_modules/mathoid-texvcjs/.npmignore R node_modules/mathoid-texvcjs/.travis.yml R node_modules/mathoid-texvcjs/bin/texvcjs R node_modules/mathoid-texvcjs/lib/ast.js R node_modules/mathoid-texvcjs/lib/astutil.js R node_modules/mathoid-texvcjs/lib/build-parser.js R node_modules/mathoid-texvcjs/lib/index.js R node_modules/mathoid-texvcjs/lib/parser.js R node_modules/mathoid-texvcjs/lib/parser.pegjs R node_modules/mathoid-texvcjs/lib/render.js R node_modules/mathoid-texvcjs/lib/texutil.js R node_modules/mathoid-texvcjs/package.json R node_modules/mathoid-texvcjs/test/all.js R node_modules/mathoid-texvcjs/test/api.js R node_modules/mathoid-texvcjs/test/ast.js R node_modules/mathoid-texvcjs/test/chem-regression.js R node_modules/mathoid-texvcjs/test/chem-regression.json R node_modules/mathoid-texvcjs/test/chemtest.tex R node_modules/mathoid-texvcjs/test/contains.js R node_modules/mathoid-texvcjs/test/en-wiki-formulae.js R node_modules/mathoid-texvcjs/test/en-wiki-formulae.json R node_modules/mathoid-texvcjs/test/mathjax-texvc.js R node_modules/mathoid-texvcjs/test/mathjax-texvc.json R node_modules/mathoid-texvcjs/test/mocha.opts R node_modules/mathoid-texvcjs/test/parser.js R node_modules/mathoid-texvcjs/test/render.js M node_modules/swagger-ui/package.json M node_modules/texvcinfo/.codeclimate.yml M node_modules/texvcinfo/.eslintignore M node_modules/texvcinfo/.eslintrc M node_modules/texvcinfo/.jshintignore M node_modules/texvcinfo/.jshintrc M node_modules/texvcinfo/.npmignore M node_modules/texvcinfo/.travis.yml M node_modules/texvcinfo/doc/commands.tex M node_modules/texvcinfo/doc/literals.tex M node_modules/texvcinfo/doc/main.pdf M node_modules/texvcinfo/doc/main.tex M node_modules/texvcinfo/lib/arrayTree.js M node_modules/texvcinfo/lib/d3json.js M node_modules/texvcinfo/lib/extractors/mods.js M node_modules/texvcinfo/lib/extractors/subscripts.js M node_modules/texvcinfo/lib/feedback.js M node_modules/texvcinfo/lib/flatList.js M node_modules/texvcinfo/lib/identifier.js M node_modules/texvcinfo/lib/index.js M node_modules/texvcinfo/lib/letterMods.json M node_modules/texvcinfo/lib/literals.json M node_modules/texvcinfo/lib/tokenTypes.js D node_modules/texvcinfo/node_modules/.bin/texvcjs M node_modules/texvcinfo/package.json M node_modules/texvcinfo/test/feedback.js M node_modules/texvcinfo/test/gold.js M node_modules/texvcinfo/test/goldData.js M node_modules/texvcinfo/test/identifier.js M node_modules/texvcinfo/test/index.js M node_modules/texvcinfo/test/mocha.opts M node_modules/texvcinfo/test/tokenizer.js M node_modules/texvcinfo/test/tree2d3json.js M node_modules/texvcinfo/test/treeWriter.js M node_modules/texvcinfo/utils/createDoc.js M node_modules/texvcinfo/vis/index.html 69 files changed, 106 insertions(+), 95 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy refs/changes/26/401926/1 diff --git a/node_modules/.bin/texvcinfo b/node_modules/.bin/texvcinfo new file mode 12 index 000..c04501a --- /dev/null +++ b/node_modules/.bin/texvcinfo @@ -0,0 +1 @@ +../texvcinfo/bin/texvcinfo \ No newline at end of file diff --git a/node_modules/.bin/texvcjs b/node_modules/.bin/texvcjs index c04501a..5f7e9a4 12 --- a/node_modules/.bin/texvcjs +++ b/node_modules/.bin/texvcjs @@ -1 +1 @@ -../texvcinfo/bin/texvcinfo \ No newline at end of file +../mathoid-texvcjs/bin/texvcjs \ No newline at end of file diff --git a/node_modules/commander/package.json b/node_modules/commander/package.json index 24a31d7..9d7038b 100644 --- a/node_modules/commander/package.json +++ b/node_modules/commander/package.json @@ -39,9 +39,9 @@ }, "_requiredBy": [ "#DEV:/", +"/mathoid-texvcjs", "/speech-rule-engine", -"/texvcinfo", -"/texvcinfo/mathoid-texvcjs" +"/texvcinfo" ], "_resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";, "_shasum": "0f5946c427ed9ec0d91a46bb9def53e54650e555", diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json index 5d8d870..e07d9da 100644 --- a/node_modules/kad/package.json +++ b/node_modules/kad/package.json @@ -49,7 +49,7 @@ "/limitation" ], "_resolved": "git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";, - "_shasum": "6def549a4e39b5cbb43e008cf91234548769407f", + "_shasum": "cffb35582d9f2ce2d2bc4fac01dd14e94361da98", "_shrinkwra
[MediaWiki-commits] [Gerrit] operations/puppet[production]: RESTBase: Set up RESTBase for the production_ng role as well
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401784 )
Change subject: RESTBase: Set up RESTBase for the production_ng role as well
..
RESTBase: Set up RESTBase for the production_ng role as well
During the migration from Cassandra 2 to Cassandra 3 we chose not to set
up RESTBase on the new nodes, but now the time has come to transition
RESTBase to them as well.
Bug: T184110
Change-Id: Ie2484c2175e56ed40e5108b6ec41adbccfa19bfa
---
A hieradata/role/codfw/restbase/production_ng.yaml
M hieradata/role/common/restbase/production_ng.yaml
A hieradata/role/eqiad/restbase/production_ng.yaml
M modules/profile/manifests/restbase.pp
M modules/role/manifests/restbase/production_ng.pp
5 files changed, 82 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/401784/1
diff --git a/hieradata/role/codfw/restbase/production_ng.yaml
b/hieradata/role/codfw/restbase/production_ng.yaml
new file mode 100644
index 000..c820561
--- /dev/null
+++ b/hieradata/role/codfw/restbase/production_ng.yaml
@@ -0,0 +1,30 @@
+profile::restbase::seeds_ng:
+ - restbase2001-a.codfw.wmnet
+ - restbase2001-b.codfw.wmnet
+ - restbase2001-c.codfw.wmnet
+ - restbase2002-a.codfw.wmnet
+ - restbase2002-b.codfw.wmnet
+ - restbase2002-c.codfw.wmnet
+ - restbase2003-a.codfw.wmnet
+ - restbase2003-b.codfw.wmnet
+ - restbase2003-c.codfw.wmnet
+ - restbase2005-a.codfw.wmnet
+ - restbase2005-b.codfw.wmnet
+ - restbase2005-c.codfw.wmnet
+# used for rate limiting
+profile::restbase::hosts:
+ - restbase2001.codfw.wmnet
+ - restbase2002.codfw.wmnet
+ - restbase2003.codfw.wmnet
+ - restbase2004.codfw.wmnet
+ - restbase2005.codfw.wmnet
+ - restbase2006.codfw.wmnet
+ - restbase2007.codfw.wmnet
+ - restbase2008.codfw.wmnet
+ - restbase2009.codfw.wmnet
+ - restbase2010.codfw.wmnet
+ - restbase2011.codfw.wmnet
+ - restbase2012.codfw.wmnet
+
+lvs::realserver::realserver_ips:
+ - '10.2.1.17' # restbase.svc.codfw.wmnet
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index bbeaea3..c73e81b 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -1,4 +1,29 @@
cluster: restbase
+
+#
+# RESTBase
+#
+profile::restbase::cassandra_local_dc: "%{::site}"
+profile::restbase::logging_label: restbase
+profile::restbase::cassandra_datacenters:
+- "eqiad"
+- "codfw"
+profile::restbase::parsoid_uri: "http://parsoid.discovery.wmnet:8000";
+profile::restbase::graphoid_uri: "http://graphoid.discovery.wmnet:19000";
+profile::restbase::mobileapps_uri: "http://mobileapps.discovery.wmnet:";
+profile::restbase::mathoid_uri: "http://mathoid.discovery.wmnet:10042";
+profile::restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
+profile::restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
+profile::restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
+profile::restbase::eventlogging_service_uri:
"http://eventbus.discovery.wmnet:8085/v1/events";
+profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080";
+profile::restbase::recommendation_uri:
"http://recommendation-api.discovery.wmnet:9632";
+profile::restbase::cassandra_user: restb
+profile::restbase::cassandra_password: "%{passwords::cassandra::restbase}"
+profile::restbase::monitor_domain: en.wikipedia.org
+profile::restbase::cassandra_tls:
+ ca: /dev/null
+
#
# Cassandra
#
diff --git a/hieradata/role/eqiad/restbase/production_ng.yaml
b/hieradata/role/eqiad/restbase/production_ng.yaml
new file mode 100644
index 000..8d770bd
--- /dev/null
+++ b/hieradata/role/eqiad/restbase/production_ng.yaml
@@ -0,0 +1,24 @@
+profile::restbase::seeds_ng:
+ - restbase1008-a.eqiad.wmnet
+ - restbase1008-b.eqiad.wmnet
+ - restbase1008-c.eqiad.wmnet
+ - restbase1009-a.eqiad.wmnet
+ - restbase1009-b.eqiad.wmnet
+ - restbase1009-c.eqiad.wmnet
+ - restbase1010-a.eqiad.wmnet
+ - restbase1010-b.eqiad.wmnet
+ - restbase1010-c.eqiad.wmnet
+# used for rate limiting
+profile::restbase::hosts:
+ - restbase1007.eqiad.wmnet
+ - restbase1008.eqiad.wmnet
+ - restbase1009.eqiad.wmnet
+ - restbase1010.eqiad.wmnet
+ - restbase1011.eqiad.wmnet
+ - restbase1012.eqiad.wmnet
+ - restbase1013.eqiad.wmnet
+ - restbase1014.eqiad.wmnet
+ - restbase1015.eqiad.wmnet
+ - restbase1016.eqiad.wmnet
+ - restbase1017.eqiad.wmnet
+ - restbase1018.eqiad.wmnet
diff --git a/modules/profile/manifests/restbase.pp
b/modules/profile/manifests/restbase.pp
index 6aeba70..70c9072 100644
--- a/modules/profile/manifests/restbase.pp
+++ b/modules/profile/manifests/restbase.pp
@@ -71,7 +71,6 @@
class profile::restbase(
$cassandra_user = hiera('profile::restbase::cassandra_user'),
$cassandra_password = hiera('profile::restbase::cassandra_password'),
-$seeds = hi
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401715 ) Change subject: Update mathoid to bad5ec8d4 .. Update mathoid to bad5ec8d4 List of changes: xxx Update node module dependencies Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c --- M node_modules/kad/package.json M node_modules/swagger-ui/package.json M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs M node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/api.js A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.json A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chemtest.tex M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.js M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json 12 files changed, 71,968 insertions(+), 262 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/401715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401715 ) Change subject: Update mathoid to bad5ec8d4 .. Update mathoid to bad5ec8d4 List of changes: xxx Update node module dependencies Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c --- M node_modules/kad/package.json M node_modules/swagger-ui/package.json M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs M node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/api.js A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.json A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chemtest.tex M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.js M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json 12 files changed, 71,968 insertions(+), 262 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy refs/changes/15/401715/1 -- To view, visit https://gerrit.wikimedia.org/r/401715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update citoid to d0087e2
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401489 ) Change subject: Update citoid to d0087e2 .. Update citoid to d0087e2 List of changes: d0087e2 Update to service-template-node v0.5.4 xxx Update node module dependencies Change-Id: I7755d9bcccb79a62ba3c362c9c1a68c231736e5e --- A node_modules/.bin/node-pre-gyp A node_modules/.bin/nopt A node_modules/.bin/rc A node_modules/abbrev/LICENSE A node_modules/abbrev/abbrev.js A node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.bundle.js M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/lib/ajv.js M node_modules/ajv/lib/compile/index.js M node_modules/ajv/lib/compile/rules.js M node_modules/ajv/lib/dot/format.jst M node_modules/ajv/lib/dot/ref.jst M node_modules/ajv/lib/dot/validate.jst M node_modules/ajv/lib/dotjs/format.js M node_modules/ajv/lib/dotjs/ref.js M node_modules/ajv/lib/dotjs/validate.js M node_modules/ajv/lib/keyword.js M node_modules/ajv/lib/refs/json-schema-draft-06.json M node_modules/ajv/package.json A node_modules/aproba/LICENSE A node_modules/aproba/index.js A node_modules/aproba/package.json A node_modules/are-we-there-yet/LICENSE A node_modules/are-we-there-yet/index.js A node_modules/are-we-there-yet/package.json A node_modules/are-we-there-yet/tracker-base.js A node_modules/are-we-there-yet/tracker-group.js A node_modules/are-we-there-yet/tracker-stream.js A node_modules/are-we-there-yet/tracker.js A node_modules/block-stream/LICENSE A node_modules/block-stream/block-stream.js A node_modules/block-stream/package.json M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/debuggability.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/util.js M node_modules/bluebird/package.json M node_modules/body-parser/package.json M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/cassandra-uuid/package.json M node_modules/compression/package.json A node_modules/console-control-strings/LICENSE A node_modules/console-control-strings/index.js A node_modules/console-control-strings/package.json D node_modules/core-js/Gruntfile.js D node_modules/core-js/LICENSE D node_modules/core-js/bower.json D node_modules/core-js/build/Gruntfile.ls D node_modules/core-js/build/build.ls D node_modules/core-js/build/config.js D node_modules/core-js/build/index.js D node_modules/core-js/client/core.js D node_modules/core-js/client/core.min.js D node_modules/core-js/client/core.min.js.map D node_modules/core-js/client/library.js D node_modules/core-js/client/library.min.js D node_modules/core-js/client/library.min.js.map D node_modules/core-js/client/shim.js D node_modules/core-js/client/shim.min.js D node_modules/core-js/client/shim.min.js.map D node_modules/core-js/core/_.js D node_modules/core-js/core/delay.js D node_modules/core-js/core/dict.js D node_modules/core-js/core/function.js D node_modules/core-js/core/index.js D node_modules/core-js/core/number.js D node_modules/core-js/core/object.js D node_modules/core-js/core/regexp.js D node_modules/core-js/core/string.js D node_modules/core-js/es5/index.js D node_modules/core-js/es6/array.js D node_modules/core-js/es6/date.js D node_modules/core-js/es6/function.js D node_modules/core-js/es6/index.js D node_modules/core-js/es6/map.js D node_modules/core-js/es6/math.js D node_modules/core-js/es6/number.js D node_modules/core-js/es6/object.js D node_modules/core-js/es6/parse-float.js D node_modules/core-js/es6/parse-int.js D node_modules/core-js/es6/promise.js D node_modules/core-js/es6/reflect.js D node_modules/core-js/es6/regexp.js D node_modules/core-js/es6/set.js D node_modules/core-js/es6/string.js D node_modules/core-js/es6/symbol.js D node_modules/core-js/es6/typed.js D node_modules/core-js/es6/weak-map.js D node_modules/core-js/es6/weak-set.js D node_modules/core-js/es7/array.js D node_modules/core-js/es7/asap.js D node_modules/core-js/es7/error.js D node_modules/core-js/es7/index.js D node_modules/core-js/es7/map.js D node_modules/core-js/es7/math.js D node_modules/core-js/es7/object.js D node_modules/core-js/es7/observable.js D node_modules/core-js/es7/reflect.js D node_modules/core-js/es7/set.js D node_modules/core-js/es7/string.js D node_modules/core-js/es7/symbol.js D node_modules/core-js/es7/system.js D node_modules/core-js/fn/_.js D node_modules/core-js/fn/array/concat.js D node_modules/core-js/fn/array/copy-within.js D node_modules/core-js/fn/array/entries.js D node_modules/core-js/fn/array/every.js D node_modules/core-js/fn/array/fill.js D node_
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update citoid to d0087e2
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401489 ) Change subject: Update citoid to d0087e2 .. Update citoid to d0087e2 List of changes: d0087e2 Update to service-template-node v0.5.4 xxx Update node module dependencies Change-Id: I7755d9bcccb79a62ba3c362c9c1a68c231736e5e --- A node_modules/.bin/node-pre-gyp A node_modules/.bin/nopt A node_modules/.bin/rc A node_modules/abbrev/LICENSE A node_modules/abbrev/abbrev.js A node_modules/abbrev/package.json M node_modules/ajv/dist/ajv.bundle.js M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/lib/ajv.js M node_modules/ajv/lib/compile/index.js M node_modules/ajv/lib/compile/rules.js M node_modules/ajv/lib/dot/format.jst M node_modules/ajv/lib/dot/ref.jst M node_modules/ajv/lib/dot/validate.jst M node_modules/ajv/lib/dotjs/format.js M node_modules/ajv/lib/dotjs/ref.js M node_modules/ajv/lib/dotjs/validate.js M node_modules/ajv/lib/keyword.js M node_modules/ajv/lib/refs/json-schema-draft-06.json M node_modules/ajv/package.json A node_modules/aproba/LICENSE A node_modules/aproba/index.js A node_modules/aproba/package.json A node_modules/are-we-there-yet/LICENSE A node_modules/are-we-there-yet/index.js A node_modules/are-we-there-yet/package.json A node_modules/are-we-there-yet/tracker-base.js A node_modules/are-we-there-yet/tracker-group.js A node_modules/are-we-there-yet/tracker-stream.js A node_modules/are-we-there-yet/tracker.js A node_modules/block-stream/LICENSE A node_modules/block-stream/block-stream.js A node_modules/block-stream/package.json M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/debuggability.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/util.js M node_modules/bluebird/package.json M node_modules/body-parser/package.json M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/cassandra-uuid/package.json M node_modules/compression/package.json A node_modules/console-control-strings/LICENSE A node_modules/console-control-strings/index.js A node_modules/console-control-strings/package.json D node_modules/core-js/Gruntfile.js D node_modules/core-js/LICENSE D node_modules/core-js/bower.json D node_modules/core-js/build/Gruntfile.ls D node_modules/core-js/build/build.ls D node_modules/core-js/build/config.js D node_modules/core-js/build/index.js D node_modules/core-js/client/core.js D node_modules/core-js/client/core.min.js D node_modules/core-js/client/core.min.js.map D node_modules/core-js/client/library.js D node_modules/core-js/client/library.min.js D node_modules/core-js/client/library.min.js.map D node_modules/core-js/client/shim.js D node_modules/core-js/client/shim.min.js D node_modules/core-js/client/shim.min.js.map D node_modules/core-js/core/_.js D node_modules/core-js/core/delay.js D node_modules/core-js/core/dict.js D node_modules/core-js/core/function.js D node_modules/core-js/core/index.js D node_modules/core-js/core/number.js D node_modules/core-js/core/object.js D node_modules/core-js/core/regexp.js D node_modules/core-js/core/string.js D node_modules/core-js/es5/index.js D node_modules/core-js/es6/array.js D node_modules/core-js/es6/date.js D node_modules/core-js/es6/function.js D node_modules/core-js/es6/index.js D node_modules/core-js/es6/map.js D node_modules/core-js/es6/math.js D node_modules/core-js/es6/number.js D node_modules/core-js/es6/object.js D node_modules/core-js/es6/parse-float.js D node_modules/core-js/es6/parse-int.js D node_modules/core-js/es6/promise.js D node_modules/core-js/es6/reflect.js D node_modules/core-js/es6/regexp.js D node_modules/core-js/es6/set.js D node_modules/core-js/es6/string.js D node_modules/core-js/es6/symbol.js D node_modules/core-js/es6/typed.js D node_modules/core-js/es6/weak-map.js D node_modules/core-js/es6/weak-set.js D node_modules/core-js/es7/array.js D node_modules/core-js/es7/asap.js D node_modules/core-js/es7/error.js D node_modules/core-js/es7/index.js D node_modules/core-js/es7/map.js D node_modules/core-js/es7/math.js D node_modules/core-js/es7/object.js D node_modules/core-js/es7/observable.js D node_modules/core-js/es7/reflect.js D node_modules/core-js/es7/set.js D node_modules/core-js/es7/string.js D node_modules/core-js/es7/symbol.js D node_modules/core-js/es7/system.js D node_modules/core-js/fn/_.js D node_modules/core-js/fn/array/concat.js D node_modules/core-js/fn/array/copy-within.js D node_modules/core-js/fn/array/entries.js D node_modules/core-js/fn/array/every.js D node_modules/core-js/fn/array/fill.js D node_modules/
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: service::node: Fix RESTBase port
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401376 )
Change subject: service::node: Fix RESTBase port
..
service::node: Fix RESTBase port
Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
M puppet/modules/service/templates/node/config.yaml.erb
2 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/76/401376/1
diff --git a/puppet/modules/service/manifests/node.pp
b/puppet/modules/service/manifests/node.pp
index fe6a042..c08bbb7 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -95,11 +95,6 @@
undef => $::service::log_level,
default => $log_level
}
-# ensure the RB port is defined for the config
-$restbase_port = $::restbase::port ? {
-undef => 7231,
-default => $::restbase::port
-}
# the repo
git::clone { $title:
diff --git a/puppet/modules/service/templates/node/config.yaml.erb
b/puppet/modules/service/templates/node/config.yaml.erb
index f46a576..c858429 100644
--- a/puppet/modules/service/templates/node/config.yaml.erb
+++ b/puppet/modules/service/templates/node/config.yaml.erb
@@ -55,7 +55,7 @@
# the template used for contacting RESTBase
restbase_req:
method: '{{request.method}}'
-uri: http://localhost:<%= @restbase_port %>/{{domain}}/v1/{+path}
+uri: http://localhost:<%= scope['::restbase::port'] ?
scope['::restbase::port'] : 7231 %>/{{domain}}/v1/{+path}
query: '{{ default(request.query, {}) }}'
headers: '{{request.headers}}'
body: '{{request.body}}'
--
To view, visit https://gerrit.wikimedia.org/r/401376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
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
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399865 )
Change subject: Update mathoid to bad5ec8d4
..
Update mathoid to bad5ec8d4
List of changes:
xxx Update node module dependencies
Change-Id: I4629127a7b7c0fb2ee164033ca91359a9eb21363
---
M node_modules/commander/package.json
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs
D
node_modules/texvcinfo/node_modules/mathoid-texvcjs/node_modules/commander/LICENSE
D
node_modules/texvcinfo/node_modules/mathoid-texvcjs/node_modules/commander/index.js
D
node_modules/texvcinfo/node_modules/mathoid-texvcjs/node_modules/commander/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
M node_modules/texvcinfo/package.json
11 files changed, 178 insertions(+), 1,395 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/node_modules/commander/package.json
b/node_modules/commander/package.json
index 1df7c5b..24a31d7 100644
--- a/node_modules/commander/package.json
+++ b/node_modules/commander/package.json
@@ -40,7 +40,8 @@
"_requiredBy": [
"#DEV:/",
"/speech-rule-engine",
-"/texvcinfo"
+"/texvcinfo",
+"/texvcinfo/mathoid-texvcjs"
],
"_resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";,
"_shasum": "0f5946c427ed9ec0d91a46bb9def53e54650e555",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index e6d8c14..ce826bd 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "6e48bf96dab30a8885bbefa011b407bdf40e59de",
+ "_shasum": "9fb3d1421ea9229ca03eabaeb32f4351a509cc69",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index aae0c8d..8d7adce 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "e6e159e75fa9920e3633f83801c9b65d629a1d92",
+ "_shasum": "9e6dd8a93e10ad59160202ef5e61d1135ca807f0",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
b/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
index db06444..0755e18 100644
--- a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
+++ b/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
@@ -411,51 +411,52 @@
peg$c258 = /^[01]/,
peg$c259 = peg$classExpectation(["0", "1"], false, false),
peg$c260 = function(f) { return tu.mhchem_single_macro[f]; },
-peg$c261 = function(f) { return tu.mhchem_bond[f]; },
-peg$c262 = function(f) { return tu.mhchem_macro_1p[f]; },
-peg$c263 = function(f) { return tu.mhchem_macro_2p[f]; },
-peg$c264 = function(f) { return tu.mhchem_macro_2pu[f]; },
-peg$c265 = function(f) { return tu.mhchem_macro_2pc[f]; },
-peg$c266 = /^[+-.*']/,
-peg$c267 = peg$classExpectation([["+", "."], "*", "'"], false, false),
-peg$c268 = "=",
-peg$c269 = peg$literalExpectation("=", false),
-peg$c270 = "#",
-peg$c271 = peg$literalExpectation("#", false),
-peg$c272 = "~--",
-peg$c273 = peg$literalExpectation("~--", false),
-peg$c274 = "~-",
-peg$c275 = peg$literalExpectation("~-", false),
-peg$c276 = "~=",
-peg$c277 = peg$literalExpectation("~=", false),
-peg$c278 = "~",
-peg$c279 = peg$literalExpectation("~", false),
-peg$c280 = "-~-",
-peg$c281 = peg$literalExpectation("-~-", false),
-peg$c282 = "",
-peg$c283 = peg$literalExpectation("", false),
-peg$c284 = "...",
-peg$c285 = peg$literalExpectation("...", false),
-peg$c286 = "<-",
-peg$c287 = peg$literalExpectation("<-", false),
-peg$c288 = "->",
-peg$c289 = peg$literalExpectation("->", false),
-peg$c290 = "1",
-peg$c291 = peg$literalExpectation("1", false),
-peg$c292 = "2",
-peg$c293 = peg$literalExpectation("2", false),
-peg$c294 = "3",
-peg$c295 = peg$literalExpectation("3", false),
-peg$c296 = "{math}",
-
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399865 )
Change subject: Update mathoid to bad5ec8d4
..
Update mathoid to bad5ec8d4
List of changes:
xxx Update node module dependencies
Change-Id: I4629127a7b7c0fb2ee164033ca91359a9eb21363
---
M node_modules/commander/package.json
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs
D
node_modules/texvcinfo/node_modules/mathoid-texvcjs/node_modules/commander/LICENSE
D
node_modules/texvcinfo/node_modules/mathoid-texvcjs/node_modules/commander/index.js
D
node_modules/texvcinfo/node_modules/mathoid-texvcjs/node_modules/commander/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
M node_modules/texvcinfo/package.json
11 files changed, 178 insertions(+), 1,395 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy
refs/changes/65/399865/1
diff --git a/node_modules/commander/package.json
b/node_modules/commander/package.json
index 1df7c5b..24a31d7 100644
--- a/node_modules/commander/package.json
+++ b/node_modules/commander/package.json
@@ -40,7 +40,8 @@
"_requiredBy": [
"#DEV:/",
"/speech-rule-engine",
-"/texvcinfo"
+"/texvcinfo",
+"/texvcinfo/mathoid-texvcjs"
],
"_resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";,
"_shasum": "0f5946c427ed9ec0d91a46bb9def53e54650e555",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index e6d8c14..ce826bd 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "6e48bf96dab30a8885bbefa011b407bdf40e59de",
+ "_shasum": "9fb3d1421ea9229ca03eabaeb32f4351a509cc69",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index aae0c8d..8d7adce 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "e6e159e75fa9920e3633f83801c9b65d629a1d92",
+ "_shasum": "9e6dd8a93e10ad59160202ef5e61d1135ca807f0",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
b/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
index db06444..0755e18 100644
--- a/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
+++ b/node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
@@ -411,51 +411,52 @@
peg$c258 = /^[01]/,
peg$c259 = peg$classExpectation(["0", "1"], false, false),
peg$c260 = function(f) { return tu.mhchem_single_macro[f]; },
-peg$c261 = function(f) { return tu.mhchem_bond[f]; },
-peg$c262 = function(f) { return tu.mhchem_macro_1p[f]; },
-peg$c263 = function(f) { return tu.mhchem_macro_2p[f]; },
-peg$c264 = function(f) { return tu.mhchem_macro_2pu[f]; },
-peg$c265 = function(f) { return tu.mhchem_macro_2pc[f]; },
-peg$c266 = /^[+-.*']/,
-peg$c267 = peg$classExpectation([["+", "."], "*", "'"], false, false),
-peg$c268 = "=",
-peg$c269 = peg$literalExpectation("=", false),
-peg$c270 = "#",
-peg$c271 = peg$literalExpectation("#", false),
-peg$c272 = "~--",
-peg$c273 = peg$literalExpectation("~--", false),
-peg$c274 = "~-",
-peg$c275 = peg$literalExpectation("~-", false),
-peg$c276 = "~=",
-peg$c277 = peg$literalExpectation("~=", false),
-peg$c278 = "~",
-peg$c279 = peg$literalExpectation("~", false),
-peg$c280 = "-~-",
-peg$c281 = peg$literalExpectation("-~-", false),
-peg$c282 = "",
-peg$c283 = peg$literalExpectation("", false),
-peg$c284 = "...",
-peg$c285 = peg$literalExpectation("...", false),
-peg$c286 = "<-",
-peg$c287 = peg$literalExpectation("<-", false),
-peg$c288 = "->",
-peg$c289 = peg$literalExpectation("->", false),
-peg$c290 = "1",
-peg$c291 = peg$literalExpectation("1", false),
-peg$c292 = "2",
-peg$c293 = peg$literalExpectation("2", false),
-peg$c294 = "3",
-peg$c295 = peg$literalExpectation("3", false
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update config for Mathoid v0.7.0
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399811 ) Change subject: Update config for Mathoid v0.7.0 .. Update config for Mathoid v0.7.0 Bug: T172767 Change-Id: Iad0bf2da468822e69096a7b5577b23109761b51f --- M scap/templates/config.yaml.j2 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index fc57367..f698eba 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -69,10 +69,28 @@ svg: true img: true png: true - speech: false texvcinfo: true - speech_on: false no_check: true + speech: true + speech_on: false + speech_config: +semantics: true +domain: 'mathspeak' +style: 'default' +semantic: false +minSTree: false +speakText: true +enrich: false + mj_config: + extensions: "TeX/color,TeX/mediawiki-texvc,TeX/mhchem" + MathJax: +menuSettings: + semantics: true +SVG: + font: "TeX" +TeX: + noErrors: +disabled: true dpi: 180 svgo: false # the user agent to use when issuing requests -- To view, visit https://gerrit.wikimedia.org/r/399811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad0bf2da468822e69096a7b5577b23109761b51f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Physikerwelt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update config for Mathoid v0.7.0
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399811 ) Change subject: Update config for Mathoid v0.7.0 .. Update config for Mathoid v0.7.0 Bug: T172767 Change-Id: Iad0bf2da468822e69096a7b5577b23109761b51f --- M scap/templates/config.yaml.j2 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy refs/changes/11/399811/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index fc57367..f698eba 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -69,10 +69,28 @@ svg: true img: true png: true - speech: false texvcinfo: true - speech_on: false no_check: true + speech: true + speech_on: false + speech_config: +semantics: true +domain: 'mathspeak' +style: 'default' +semantic: false +minSTree: false +speakText: true +enrich: false + mj_config: + extensions: "TeX/color,TeX/mediawiki-texvc,TeX/mhchem" + MathJax: +menuSettings: + semantics: true +SVG: + font: "TeX" +TeX: + noErrors: +disabled: true dpi: 180 svgo: false # the user agent to use when issuing requests -- To view, visit https://gerrit.wikimedia.org/r/399811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad0bf2da468822e69096a7b5577b23109761b51f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Use the new versions of mocha and eslint and their configs
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399361 )
Change subject: Use the new versions of mocha and eslint and their configs
..
Use the new versions of mocha and eslint and their configs
Change-Id: Ifa503f878f04c2f1868c3b44c4dcab3c5ed7bf9d
---
M lib/queue.js
M lib/swagger-ui.js
M package.json
M test/mocha.opts
4 files changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render
refs/changes/61/399361/1
diff --git a/lib/queue.js b/lib/queue.js
index c7fa3f5..5fb4624 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -41,7 +41,7 @@
*/
constructor(queueOptions, puppeteerOptions, pdfOptions, logger) {
this._queueObject = asyncQueue(this._worker.bind(this),
- queueOptions.concurrency);
+queueOptions.concurrency);
this._puppeteerOptions = puppeteerOptions;
this._pdfOptions = pdfOptions;
this._options = queueOptions;
@@ -128,7 +128,7 @@
{
msg: 'Queue is full, rejecting the request.',
id: data.id,
-queueSize: queueSize
+queueSize
}
);
callback(callbackErrors.queueFull, null);
@@ -142,7 +142,7 @@
{
msg: 'Job is being added to the queue.',
id: data.id,
-queueSize: queueSize
+queueSize
}
);
// this time is used for measuring the time task waits in queue
diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
index 9e39ff5..a85985c 100644
--- a/lib/swagger-ui.js
+++ b/lib/swagger-ui.js
@@ -33,7 +33,7 @@
.replace(/((?:src|href)=['"])/g, '$1?doc&path=')
// Some self-promotion
.replace(//,
-`${app.info.name}`)
+`${app.info.name}`)
.replace(/[^<]*<\/title>/,
`${app.info.name}`)
// Replace the default url with ours, switch off validation &
// limit the size of documents to apply syntax highlighting to
diff --git a/package.json b/package.json
index 7e5e6df..4e4040c 100644
--- a/package.json
+++ b/package.json
@@ -46,16 +46,17 @@
"swagger-ui": "git+https://github.com/wikimedia/swagger-ui.git#master";
},
"devDependencies": {
+"ajv": "^5.5.0",
"extend": "^3.0.1",
"istanbul": "^0.4.5",
"mocha": "^4.0.1",
"mocha-jshint": "^2.3.1",
"mocha-lcov-reporter": "^1.3.0",
"nsp": "^2.8.1",
-"mocha-eslint": "^3.0.1",
-"eslint": "^3.12.0",
-"eslint-config-node-services": "^2.0.2",
-"eslint-config-wikimedia": "^0.4.0",
+"mocha-eslint": "^4.0.1",
+"eslint": "^4.12.0",
+"eslint-config-node-services": "^2.2.5",
+"eslint-config-wikimedia": "^0.5.0",
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-jsdoc": "^3.0.0"
},
diff --git a/test/mocha.opts b/test/mocha.opts
index 5a2be76..d8a47e6 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,3 @@
--recursive
--no-timeouts
+--exit
--
To view, visit https://gerrit.wikimedia.org/r/399361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa503f878f04c2f1868c3b44c4dcab3c5ed7bf9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Update to mathoid-mathjax-node 0.7
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370603 ) Change subject: Update to mathoid-mathjax-node 0.7 .. Update to mathoid-mathjax-node 0.7 * Adjust the mathoid package to be compatible with MathJax-node 1.0 * Calculate the mathoid style attribute which was formerly done in mathjax-node * Add speech support adapted from https://github.com/pkra/mathjax-node-sre/blob/master/lib/main.js * Add option to expose enriched pmml * Fix: order of expected and actual output The order of actual and expected output was swapped. * Fix \definecolor is unknown Explicitly load color module. See also https://github.com/mathjax/MathJax-node/issues/307 * Do not use semantic annotations for simple tests * Update dependencies * Update reference images * Improve testing infrastructure ** ignore XML inherent differences ** improve test coverage 100% now for math related code i.e., lib/math.js, lib/render.js, routes/mathoid.js ** Fix: Dimensions in test cases ** Store testdata in a separate file ** Deduplicate test code ** Add script to adjust test ** Add more options to skip tests * Support for get requests Bug: T172767 T155201 T182316 Change-Id: I9fe1e0e5fe0585edc4f85d6a3747e3f3c748083f --- M README.md M app.js A cli.js M config.dev.yaml M config.prod.yaml A lib/math.js A lib/render.js M package.json A pm2.config.js M routes/mathoid.js A scripts/apiTestDataUpdate.js A test/features/math/cli.js A test/features/math/exceptionHandling.js A test/features/math/get.js D test/features/math/no-check.js M test/features/math/simple.js M test/features/math/svgo.js A test/files/mathjax-texvc/basic-test-data.json M test/files/mathjax-texvc/png/1.png M test/files/mathjax-texvc/png/10.png M test/files/mathjax-texvc/png/11.png M test/files/mathjax-texvc/png/12.png M test/files/mathjax-texvc/png/13.png M test/files/mathjax-texvc/png/14.png M test/files/mathjax-texvc/png/15.png M test/files/mathjax-texvc/png/16.png M test/files/mathjax-texvc/png/17.png M test/files/mathjax-texvc/png/18.png M test/files/mathjax-texvc/png/19.png M test/files/mathjax-texvc/png/2.png M test/files/mathjax-texvc/png/20.png M test/files/mathjax-texvc/png/21.png M test/files/mathjax-texvc/png/22.png M test/files/mathjax-texvc/png/23.png M test/files/mathjax-texvc/png/24.png M test/files/mathjax-texvc/png/25.png M test/files/mathjax-texvc/png/26.png M test/files/mathjax-texvc/png/27.png M test/files/mathjax-texvc/png/28.png M test/files/mathjax-texvc/png/29.png M test/files/mathjax-texvc/png/3.png M test/files/mathjax-texvc/png/30.png M test/files/mathjax-texvc/png/31.png M test/files/mathjax-texvc/png/32.png M test/files/mathjax-texvc/png/33.png M test/files/mathjax-texvc/png/34.png M test/files/mathjax-texvc/png/35.png M test/files/mathjax-texvc/png/36.png M test/files/mathjax-texvc/png/37.png M test/files/mathjax-texvc/png/38.png M test/files/mathjax-texvc/png/39.png M test/files/mathjax-texvc/png/4.png M test/files/mathjax-texvc/png/40.png M test/files/mathjax-texvc/png/41.png M test/files/mathjax-texvc/png/42.png M test/files/mathjax-texvc/png/43.png M test/files/mathjax-texvc/png/44.png M test/files/mathjax-texvc/png/45.png M test/files/mathjax-texvc/png/46.png M test/files/mathjax-texvc/png/47.png M test/files/mathjax-texvc/png/48.png M test/files/mathjax-texvc/png/49.png M test/files/mathjax-texvc/png/5.png M test/files/mathjax-texvc/png/50.png M test/files/mathjax-texvc/png/51.png M test/files/mathjax-texvc/png/52.png M test/files/mathjax-texvc/png/53.png M test/files/mathjax-texvc/png/54.png M test/files/mathjax-texvc/png/55.png M test/files/mathjax-texvc/png/56.png M test/files/mathjax-texvc/png/57.png M test/files/mathjax-texvc/png/6.png M test/files/mathjax-texvc/png/60.png M test/files/mathjax-texvc/png/61.png M test/files/mathjax-texvc/png/62.png M test/files/mathjax-texvc/png/63.png M test/files/mathjax-texvc/png/64.png M test/files/mathjax-texvc/png/65.png M test/files/mathjax-texvc/png/66.png M test/files/mathjax-texvc/png/67.png M test/files/mathjax-texvc/png/68.png M test/files/mathjax-texvc/png/69.png M test/files/mathjax-texvc/png/7.png M test/files/mathjax-texvc/png/70.png M test/files/mathjax-texvc/png/71.png M test/files/mathjax-texvc/png/72.png M test/files/mathjax-texvc/png/73.png M test/files/mathjax-texvc/png/74.png M test/files/mathjax-texvc/png/75.png M test/files/mathjax-texvc/png/76.png M test/files/mathjax-texvc/png/77.png M test/files/mathjax-texvc/png/78.png M test/files/mathjax-texvc/png/79.png M test/files/mathjax-texvc/png/8.png M test/files/mathjax-texvc/png/80.png M test/files/mathjax-texvc/png/81.png M test/files/mathjax-texvc/png/82.png M test/files/mathjax-texvc/png/83.png M test/files/mathjax-texvc/png/84.png M test/files/mathjax-texvc/png/85.png M test/files/mathjax-texvc/png/86.png M test/files/mathjax-texvc/png/87.png M test/files/mathjax-texvc/png/9.png M test/files/mathjax-texvc/png/90.png M te
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e7f6b7
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399141 ) Change subject: Update restbase to 2e7f6b7 .. Update restbase to 2e7f6b7 List of changes: f2c28a3 Parsoid: Add the time_to_live config option to projects Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index b683cf6..2e7f6b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit b683cf6c011fdf5f14622fdf1ed676f75cbfdf3d +Subproject commit 2e7f6b7272dfa7d392e6cfd9d675679c796dd057 -- To view, visit https://gerrit.wikimedia.org/r/399141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e7f6b7
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399141 ) Change subject: Update restbase to 2e7f6b7 .. Update restbase to 2e7f6b7 List of changes: f2c28a3 Parsoid: Add the time_to_live config option to projects Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/41/399141/1 diff --git a/restbase b/restbase index b683cf6..2e7f6b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit b683cf6c011fdf5f14622fdf1ed676f75cbfdf3d +Subproject commit 2e7f6b7272dfa7d392e6cfd9d675679c796dd057 -- To view, visit https://gerrit.wikimedia.org/r/399141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic35666d229fdf67a81414277b3d2dd71a1b1508f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...citoid[master]: Update to service-template-node v0.5.4
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398506 ) Change subject: Update to service-template-node v0.5.4 .. Update to service-template-node v0.5.4 Bug: T151394 Change-Id: I9654819e01ca072fd4d308a2d8cf928233913f7a --- A .eslintrc.yml M .jshintignore M .jshintrc M .travis.yml M app.js M config.dev.yaml M config.prod.yaml M lib/Citation.js M lib/CitoidRequest.js M lib/CitoidResponse.js M lib/CitoidService.js M lib/Exporter.js M lib/JSONReader.js M lib/Scraper.js M lib/Translator.js M lib/WorldCatService.js M lib/XMLReader.js M lib/ZoteroService.js M lib/api-util.js M lib/crossRefRequest.js M lib/hostIsAllowed.js M lib/pubMedRequest.js A lib/swagger-ui.js M lib/translators/bePress.js M lib/translators/coins.js M lib/translators/dublinCore.js M lib/translators/general.js M lib/translators/marcXML.js M lib/translators/openGraph.js M lib/translators/util/index.js M lib/translators/xISBN.js M lib/unshorten.js M lib/util.js M lib/zotero/cachedTypes.js M lib/zotero/typeSchemaData.js M package.json M routes/citoid.js M routes/info.js M routes/root.js M server.js M test/features/app/index.js M test/features/app/info.js M test/features/app/spec.js M test/features/errors/address.js M test/features/errors/encoding.js M test/features/errors/index.js M test/features/errors/settings.js M test/features/scraping/baseFields.js M test/features/scraping/export.js M test/features/scraping/index.js M test/features/scraping/isbn.js M test/features/scraping/lang.js M test/features/scraping/mockZotero.js M test/features/scraping/noPubmed.js M test/features/scraping/noZotero.js M test/features/scraping/zotero.js M test/index.js M test/utils/assert.js M test/utils/logStream.js M test/utils/server.js 60 files changed, 3,319 insertions(+), 2,964 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid refs/changes/06/398506/1 -- To view, visit https://gerrit.wikimedia.org/r/398506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9654819e01ca072fd4d308a2d8cf928233913f7a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/citoid Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Trending Edits: Stop and mask the service
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398286 )
Change subject: Trending Edits: Stop and mask the service
..
Trending Edits: Stop and mask the service
The service is no longer publicly accessible, so no need for it to run
in the first place. Therefore, stop and mask it until we clean it up.
Bug: T180384
Change-Id: I039234506b35d438cfd049fadf55976404a68289
---
M modules/profile/manifests/trendingedits.pp
1 file changed, 3 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/398286/1
diff --git a/modules/profile/manifests/trendingedits.pp
b/modules/profile/manifests/trendingedits.pp
index ca57360..eed10c7 100644
--- a/modules/profile/manifests/trendingedits.pp
+++ b/modules/profile/manifests/trendingedits.pp
@@ -1,27 +1,9 @@
# Profile class for trendingedits
class profile::trendingedits {
-$kafka_config = kafka_config('main')
-$port = 6699
-
-service::packages { 'trendingedits':
-pkgs => ['librdkafka++1', 'librdkafka1'],
-dev_pkgs => ['librdkafka-dev'],
+base::service_unit { 'trendingedits':
+ensure => absent,
+mask => true
}
-service::node { 'trendingedits':
-port => $port,
-repo => 'trending-edits/deploy',
-healthcheck_url => '',
-has_spec => true,
-deployment=> 'scap3',
-deployment_config => true,
-deployment_vars => {
-broker_list => $kafka_config['brokers']['string'],
-site=> $::site,
-},
-environment => {
-'UV_THREADPOOL_SIZE' => 16
-},
-}
}
--
To view, visit https://gerrit.wikimedia.org/r/398286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I039234506b35d438cfd049fadf55976404a68289
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maps...package[master]: Update the service-runner dependency and the NodeJS version ...
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398278 )
Change subject: Update the service-runner dependency and the NodeJS version
used in prod
..
Update the service-runner dependency and the NodeJS version used in prod
Change-Id: I2188d5cd8f7976d12db8e35518dc0015c9d61cc4
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian/package
refs/changes/78/398278/1
diff --git a/package.json b/package.json
index 5721b7b..5e0ad53 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
},
"dependencies": {
"kartotherian":
"git+https://github.com/kartotherian/kartotherian.git#update-snapshot-dep";,
-"service-runner": "^2.4.6"
+"service-runner": "^2.4.8"
},
"optionalDependencies": {
"bunyan-prettystream": "*"
@@ -66,7 +66,7 @@
"swagger-router": "^0.4.2"
},
"deploy": {
-"node": "6.9.1",
+"node": "6.11.1",
"target": "debian",
"install_opts": [
"--build-from-source=mapnik",
--
To view, visit https://gerrit.wikimedia.org/r/398278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2188d5cd8f7976d12db8e35518dc0015c9d61cc4
Gerrit-PatchSet: 1
Gerrit-Project: maps/kartotherian/package
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Remove the Trending Edits options and URI
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397567 ) Change subject: Config: Remove the Trending Edits options and URI .. Config: Remove the Trending Edits options and URI Cannot be merged before https://github.com/wikimedia/restbase/pull/927 Bug: T180384 Change-Id: I01cc708fdfe1a6c6620e72c36f0c1a1410baf5be --- M scap/templates/config.yaml.j2 M scap/vars.yaml 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 0896791..801b8fd 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -141,11 +141,7 @@ en.wikipedia.org: &en.wikipedia.org x-modules: - path: projects/wmf_enwiki.yaml - options: -<<: *default_options -trending: - host: <%= trendingedits_uri %> - cache_control: s-maxage=300, max-age=60 + options: *default_options # A different project template, sharing configuration options. wikimedia.org: &wikimedia.org diff --git a/scap/vars.yaml b/scap/vars.yaml index 36c08f2..521d1aa 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -28,7 +28,6 @@ skip_updates: false pdfrender_uri: https://pdfrender-beta.wmflabs.org pdfrender_key: secret -trendingedits_uri: https://trending-beta.wmflabs.org cxserver_uri: https://cxserver-beta.wmflabs.org aqs_uri: https://wikimedia.org/api/rest_v1/metrics delete_probability: 0.25 -- To view, visit https://gerrit.wikimedia.org/r/397567 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01cc708fdfe1a6c6620e72c36f0c1a1410baf5be Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to b683cf6
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398253 ) Change subject: Update restbase to b683cf6 .. Update restbase to b683cf6 List of changes: ad082b5 Don't store the feed results b683cf6 Remove the Trending Edits end points Change-Id: I23962106ca981a5817d4dfb4b021173e9c6e11bf --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 3d1130d..b683cf6 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 3d1130d080541b8eafaa087cb8bef2d9d718e774 +Subproject commit b683cf6c011fdf5f14622fdf1ed676f75cbfdf3d -- To view, visit https://gerrit.wikimedia.org/r/398253 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23962106ca981a5817d4dfb4b021173e9c6e11bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to b683cf6
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398253 ) Change subject: Update restbase to b683cf6 .. Update restbase to b683cf6 List of changes: ad082b5 Don't store the feed results b683cf6 Remove the Trending Edits end points Change-Id: I23962106ca981a5817d4dfb4b021173e9c6e11bf --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/53/398253/1 diff --git a/restbase b/restbase index 3d1130d..b683cf6 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 3d1130d080541b8eafaa087cb8bef2d9d718e774 +Subproject commit b683cf6c011fdf5f14622fdf1ed676f75cbfdf3d -- To view, visit https://gerrit.wikimedia.org/r/398253 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23962106ca981a5817d4dfb4b021173e9c6e11bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 3d1130d
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398123 ) Change subject: Update restbase to 3d1130d .. Update restbase to 3d1130d List of changes: 6c74b8f Only use fallback storage if the specific revision is requested. 1b75ae2 Fixed the syntax error 3d1130d Actually delete files for old parsoid impl and a proxy Change-Id: I0b1b87e6de928063daaf92063560688b5f58ec50 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ppchelko: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 51316b7..3d1130d 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 51316b73a574e507f62861f9de2ec2a586b6ce6b +Subproject commit 3d1130d080541b8eafaa087cb8bef2d9d718e774 -- To view, visit https://gerrit.wikimedia.org/r/398123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b1b87e6de928063daaf92063560688b5f58ec50 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Ppchelko Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Remove new_storage_enabled_parsoid config stanza
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398101 )
Change subject: [Config] Remove new_storage_enabled_parsoid config stanza
..
[Config] Remove new_storage_enabled_parsoid config stanza
We've switched everything to use the new storage for Parsoid
content, so the configuration is not needed any more.
Bug: T179417
Change-Id: I8ebeef4743370b83683bb61b13ee9d98671fd90e
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 0 insertions(+), 9 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 469ce1b..c81c54a 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -5,8 +5,6 @@
storage_groups: []
storage_groups_ng: []
cassandra_default_consistency: localOne
-new_storage_enabled_parsoid:
- - '/.*/'
summary_impl: mcs
domains:
BetaCluster:
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d6e8caa..0896791 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -100,11 +100,6 @@
host: <%= parsoid_uri %>
grace_ttl: 86400
delete_probability: <%= delete_probability %>
- <% if new_storage_enabled_parsoid is not none and
new_storage_enabled_parsoid|length > 0 %>backends:
-new:<% for item in new_storage_enabled_parsoid %>
- - '<%= item %>'
-<% endfor -%>
-<% endif %>
action:
apiUriTemplate: <%= mwapi_uri %>
baseUriTemplate: "{{'https://{domain}/api/rest_v1'}}"
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 10a3751..36c08f2 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -32,8 +32,6 @@
cxserver_uri: https://cxserver-beta.wmflabs.org
aqs_uri: https://wikimedia.org/api/rest_v1/metrics
delete_probability: 0.25
-new_storage_enabled_parsoid:
- - /.*/
port: 7231
salt_key: '123456'
page_size: 10
--
To view, visit https://gerrit.wikimedia.org/r/398101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ebeef4743370b83683bb61b13ee9d98671fd90e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko
Gerrit-Reviewer: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 51316b7
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398102 ) Change subject: Update restbase to 51316b7 .. Update restbase to 51316b7 List of changes: 51316b7 Switch Parsoid to the Cassandra 3 storage. Change-Id: I411e6499d98a94336edcb69ec39864571d91dcfd --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index a70a130..51316b7 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit a70a130221378ea7c4cb100b5d0d86c456797fef +Subproject commit 51316b73a574e507f62861f9de2ec2a586b6ce6b -- To view, visit https://gerrit.wikimedia.org/r/398102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I411e6499d98a94336edcb69ec39864571d91dcfd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Ppchelko Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Reduce delete probability to 25%
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398011 ) Change subject: Config: Reduce delete probability to 25% .. Config: Reduce delete probability to 25% Now that all of the most high-traffic end points have been migrated, we should start taking advantage of Cassandra's range deletes in a more efficient manner. Hence, reduce the delete probability from 100% on each request to 25%. This should alleviate some of the load on the Cassandra 3 cluster. Bug: T179416 Change-Id: I5faca4292dd589684f6df159cf8a1702659830a1 --- M scap/templates/config.yaml.j2 M scap/vars.yaml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved Ppchelko: Looks good to me, but someone else must approve diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 4a4c90f..d6e8caa 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -99,6 +99,7 @@ parsoid: host: <%= parsoid_uri %> grace_ttl: 86400 + delete_probability: <%= delete_probability %> <% if new_storage_enabled_parsoid is not none and new_storage_enabled_parsoid|length > 0 %>backends: new:<% for item in new_storage_enabled_parsoid %> - '<%= item %>' diff --git a/scap/vars.yaml b/scap/vars.yaml index 167257e..10a3751 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -31,6 +31,7 @@ trendingedits_uri: https://trending-beta.wmflabs.org cxserver_uri: https://cxserver-beta.wmflabs.org aqs_uri: https://wikimedia.org/api/rest_v1/metrics +delete_probability: 0.25 new_storage_enabled_parsoid: - /.*/ port: 7231 -- To view, visit https://gerrit.wikimedia.org/r/398011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5faca4292dd589684f6df159cf8a1702659830a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Eevans Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...graphoid[master]: Update to service-template-node v0.5.4
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398031 )
Change subject: Update to service-template-node v0.5.4
..
Update to service-template-node v0.5.4
Bug: T151392
Change-Id: I21bb4113a19810e04e099fd7edcade44450ba6af
---
A .eslintrc.yml
M .travis.yml
M app.js
M lib/api-util.js
A lib/swagger-ui.js
M lib/util.js
M lib/vega.js
M lib/vega1.js
M lib/vega2.js
M package.json
M routes/graphoid-v1.js
M routes/graphoid-v2.js
M routes/info.js
M routes/root.js
M server.js
M test/features/app/app.js
M test/features/app/spec.js
M test/features/info/info.js
M test/index.js
M test/utils/assert.js
M test/utils/logStream.js
M test/utils/server.js
22 files changed, 767 insertions(+), 650 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 000..9e2c225
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1 @@
+extends: 'eslint-config-node-services'
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 34ca0bf..b6a9e5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@
sudo: false
node_js:
- - "0.10"
- - "0.12"
- "4"
- "6"
+ - "8"
- "node"
diff --git a/app.js b/app.js
index fb8bc35..9a5a618 100644
--- a/app.js
+++ b/app.js
@@ -1,18 +1,17 @@
'use strict';
-require('core-js/shim');
-
-var http = require('http');
-var BBPromise = require('bluebird');
-var express = require('express');
-var compression = require('compression');
-var bodyParser = require('body-parser');
-var fs = BBPromise.promisifyAll(require('fs'));
-var sUtil = require('./lib/util');
-var apiUtil = require('./lib/api-util');
-var packageInfo = require('./package.json');
-var yaml = require('js-yaml');
+const http = require('http');
+const BBPromise = require('bluebird');
+const express = require('express');
+const compression = require('compression');
+const bodyParser = require('body-parser');
+const fs = BBPromise.promisifyAll(require('fs'));
+const sUtil = require('./lib/util');
+const apiUtil = require('./lib/api-util');
+const packageInfo = require('./package.json');
+const yaml = require('js-yaml');
+const addShutdown = require('http-shutdown');
/**
@@ -23,7 +22,7 @@
function initApp(options) {
// the main application object
-var app = express();
+const app = express();
// get the options and make them available in the app
app.logger = options.logger;// the logging device
@@ -32,22 +31,22 @@
app.info = packageInfo; // this app's package info
// ensure some sane defaults
-if(!app.conf.port) { app.conf.port = ; }
-if(!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
-if(app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
-if(app.conf.cors === undefined) { app.conf.cors = '*'; }
-if(app.conf.csp === undefined) {
-app.conf.csp =
-"default-src 'self'; object-src 'none'; media-src *; img-src *;
style-src *; frame-ancestors 'self'";
+if (!app.conf.port) { app.conf.port = ; }
+if (!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
+if (app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
+if (app.conf.cors === undefined) { app.conf.cors = '*'; }
+if (app.conf.csp === undefined) {
+// eslint-disable-next-line max-len
+app.conf.csp = "default-src 'self'; object-src 'none'; media-src *;
img-src *; style-src *; frame-ancestors 'self'";
}
// set outgoing proxy
-if(app.conf.proxy) {
+if (app.conf.proxy) {
process.env.HTTP_PROXY = app.conf.proxy;
// if there is a list of domains which should
// not be proxied, set it
-if(app.conf.no_proxy_list) {
-if(Array.isArray(app.conf.no_proxy_list)) {
+if (app.conf.no_proxy_list) {
+if (Array.isArray(app.conf.no_proxy_list)) {
process.env.NO_PROXY = app.conf.no_proxy_list.join(',');
} else {
process.env.NO_PROXY = app.conf.no_proxy_list;
@@ -56,35 +55,35 @@
}
// set up header whitelisting for logging
-if(!app.conf.log_header_whitelist) {
+if (!app.conf.log_header_whitelist) {
app.conf.log_header_whitelist = [
-'cache-control', 'content-type', 'content-length', 'if-match',
-'user-agent', 'x-request-id'
+'cache-control', 'content-type', 'content-length', 'if-match',
+'user-agent', 'x-request-id'
];
}
-app.conf.log_header_whitelist = new RegExp('^(?:' +
app.conf.log_header_whitelist.map(function(item) {
+app.conf.log_header_whitelist = new
RegExp(`^(?:${app.conf.log_header_whitelist.map((item) => {
return item.trim();
-}).join('|') + ')$', 'i');
+}).join('|')})$`, 'i');
// set up the request templates for the APIs
a
[MediaWiki-commits] [Gerrit] mediawiki...graphoid[master]: Update to service-template-node v0.5.4
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398031 )
Change subject: Update to service-template-node v0.5.4
..
Update to service-template-node v0.5.4
Bug: T151392
Change-Id: I21bb4113a19810e04e099fd7edcade44450ba6af
---
A .eslintrc.yml
M .travis.yml
M app.js
M lib/api-util.js
A lib/swagger-ui.js
M lib/util.js
M lib/vega.js
M lib/vega1.js
M lib/vega2.js
M package.json
M routes/graphoid-v1.js
M routes/graphoid-v2.js
M routes/info.js
M routes/root.js
M server.js
M test/features/app/app.js
M test/features/app/spec.js
M test/features/info/info.js
M test/index.js
M test/utils/assert.js
M test/utils/logStream.js
M test/utils/server.js
22 files changed, 767 insertions(+), 650 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid
refs/changes/31/398031/1
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 000..9e2c225
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1 @@
+extends: 'eslint-config-node-services'
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 34ca0bf..b6a9e5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@
sudo: false
node_js:
- - "0.10"
- - "0.12"
- "4"
- "6"
+ - "8"
- "node"
diff --git a/app.js b/app.js
index fb8bc35..9a5a618 100644
--- a/app.js
+++ b/app.js
@@ -1,18 +1,17 @@
'use strict';
-require('core-js/shim');
-
-var http = require('http');
-var BBPromise = require('bluebird');
-var express = require('express');
-var compression = require('compression');
-var bodyParser = require('body-parser');
-var fs = BBPromise.promisifyAll(require('fs'));
-var sUtil = require('./lib/util');
-var apiUtil = require('./lib/api-util');
-var packageInfo = require('./package.json');
-var yaml = require('js-yaml');
+const http = require('http');
+const BBPromise = require('bluebird');
+const express = require('express');
+const compression = require('compression');
+const bodyParser = require('body-parser');
+const fs = BBPromise.promisifyAll(require('fs'));
+const sUtil = require('./lib/util');
+const apiUtil = require('./lib/api-util');
+const packageInfo = require('./package.json');
+const yaml = require('js-yaml');
+const addShutdown = require('http-shutdown');
/**
@@ -23,7 +22,7 @@
function initApp(options) {
// the main application object
-var app = express();
+const app = express();
// get the options and make them available in the app
app.logger = options.logger;// the logging device
@@ -32,22 +31,22 @@
app.info = packageInfo; // this app's package info
// ensure some sane defaults
-if(!app.conf.port) { app.conf.port = ; }
-if(!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
-if(app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
-if(app.conf.cors === undefined) { app.conf.cors = '*'; }
-if(app.conf.csp === undefined) {
-app.conf.csp =
-"default-src 'self'; object-src 'none'; media-src *; img-src *;
style-src *; frame-ancestors 'self'";
+if (!app.conf.port) { app.conf.port = ; }
+if (!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
+if (app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
+if (app.conf.cors === undefined) { app.conf.cors = '*'; }
+if (app.conf.csp === undefined) {
+// eslint-disable-next-line max-len
+app.conf.csp = "default-src 'self'; object-src 'none'; media-src *;
img-src *; style-src *; frame-ancestors 'self'";
}
// set outgoing proxy
-if(app.conf.proxy) {
+if (app.conf.proxy) {
process.env.HTTP_PROXY = app.conf.proxy;
// if there is a list of domains which should
// not be proxied, set it
-if(app.conf.no_proxy_list) {
-if(Array.isArray(app.conf.no_proxy_list)) {
+if (app.conf.no_proxy_list) {
+if (Array.isArray(app.conf.no_proxy_list)) {
process.env.NO_PROXY = app.conf.no_proxy_list.join(',');
} else {
process.env.NO_PROXY = app.conf.no_proxy_list;
@@ -56,35 +55,35 @@
}
// set up header whitelisting for logging
-if(!app.conf.log_header_whitelist) {
+if (!app.conf.log_header_whitelist) {
app.conf.log_header_whitelist = [
-'cache-control', 'content-type', 'content-length', 'if-match',
-'user-agent', 'x-request-id'
+'cache-control', 'content-type', 'content-length', 'if-match',
+'user-agent', 'x-request-id'
];
}
-app.conf.log_header_whitelist = new RegExp('^(?:' +
app.conf.log_header_whitelist.map(function(item) {
+app.conf.log_header_whitelist = new
RegExp(`^(?:${app.conf.log_header_whitelist.map((item) => {
return item.trim();
-}).join('|') + ')$', 'i');
+}).join('|')})$`, 'i');
// set up the request
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update recommendation-api to 24ee535
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398021 ) Change subject: Update recommendation-api to 24ee535 .. Update recommendation-api to 24ee535 List of changes: 24ee535 Update to service-template-node v0.5.4 xxx Update node module dependencies Change-Id: Icd6de89fada5e4aa873c7552672a549e05c137d8 --- A node_modules/.bin/node-pre-gyp A node_modules/.bin/nopt A node_modules/.bin/rc A node_modules/abbrev/LICENSE A node_modules/abbrev/abbrev.js A node_modules/abbrev/package.json M node_modules/accepts/index.js M node_modules/accepts/package.json M node_modules/ajv/.tonic_example.js M node_modules/ajv/dist/ajv.bundle.js M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/$data.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/lib/ajv.js D node_modules/ajv/lib/async.js M node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/async.js M node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/error_classes.js M node_modules/ajv/lib/compile/formats.js M node_modules/ajv/lib/compile/index.js M node_modules/ajv/lib/compile/resolve.js M node_modules/ajv/lib/compile/rules.js M node_modules/ajv/lib/compile/util.js D node_modules/ajv/lib/compile/validation_error.js M node_modules/ajv/lib/dot/_limit.jst M node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/const.jst A node_modules/ajv/lib/dot/contains.jst M node_modules/ajv/lib/dot/custom.jst M node_modules/ajv/lib/dot/definitions.def M node_modules/ajv/lib/dot/dependencies.jst M node_modules/ajv/lib/dot/errors.def M node_modules/ajv/lib/dot/format.jst M node_modules/ajv/lib/dot/items.jst M node_modules/ajv/lib/dot/missing.def M node_modules/ajv/lib/dot/oneOf.jst M node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/propertyNames.jst M node_modules/ajv/lib/dot/ref.jst M node_modules/ajv/lib/dot/required.jst D node_modules/ajv/lib/dot/v5/_formatLimit.jst D node_modules/ajv/lib/dot/v5/constant.jst D node_modules/ajv/lib/dot/v5/patternRequired.jst D node_modules/ajv/lib/dot/v5/switch.jst M node_modules/ajv/lib/dot/validate.jst D node_modules/ajv/lib/dotjs/_formatLimit.js M node_modules/ajv/lib/dotjs/_limit.js M node_modules/ajv/lib/dotjs/_limitItems.js M node_modules/ajv/lib/dotjs/_limitLength.js M node_modules/ajv/lib/dotjs/_limitProperties.js M node_modules/ajv/lib/dotjs/allOf.js M node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/const.js D node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/contains.js M node_modules/ajv/lib/dotjs/custom.js M node_modules/ajv/lib/dotjs/dependencies.js M node_modules/ajv/lib/dotjs/enum.js M node_modules/ajv/lib/dotjs/format.js M node_modules/ajv/lib/dotjs/items.js M node_modules/ajv/lib/dotjs/multipleOf.js M node_modules/ajv/lib/dotjs/not.js M node_modules/ajv/lib/dotjs/oneOf.js M node_modules/ajv/lib/dotjs/pattern.js D node_modules/ajv/lib/dotjs/patternRequired.js M node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/propertyNames.js M node_modules/ajv/lib/dotjs/ref.js M node_modules/ajv/lib/dotjs/required.js D node_modules/ajv/lib/dotjs/switch.js M node_modules/ajv/lib/dotjs/uniqueItems.js M node_modules/ajv/lib/dotjs/validate.js M node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/patternGroups.js A node_modules/ajv/lib/refs/$data.json A node_modules/ajv/lib/refs/json-schema-draft-06.json M node_modules/ajv/lib/refs/json-schema-v5.json D node_modules/ajv/lib/v5.js M node_modules/ajv/package.json M node_modules/ajv/scripts/bundle.js M node_modules/ajv/scripts/compile-dots.js A node_modules/aproba/LICENSE A node_modules/aproba/index.js A node_modules/aproba/package.json A node_modules/are-we-there-yet/LICENSE A node_modules/are-we-there-yet/index.js A node_modules/are-we-there-yet/package.json A node_modules/are-we-there-yet/tracker-base.js A node_modules/are-we-there-yet/tracker-group.js A node_modules/are-we-there-yet/tracker-stream.js A node_modules/are-we-there-yet/tracker.js M node_modules/assert-plus/assert.js M node_modules/assert-plus/package.json M node_modules/aws-sign2/index.js M node_modules/aws-sign2/package.json M node_modules/aws4/package.json A node_modules/block-stream/LICENSE A node_modules/block-stream/block-stream.js A node_modules/block-stream/package.json M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/debuggability.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/util.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/lib/types/text.js M node
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update recommendation-api to 24ee535
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398021 ) Change subject: Update recommendation-api to 24ee535 .. Update recommendation-api to 24ee535 List of changes: 24ee535 Update to service-template-node v0.5.4 xxx Update node module dependencies Change-Id: Icd6de89fada5e4aa873c7552672a549e05c137d8 --- A node_modules/.bin/node-pre-gyp A node_modules/.bin/nopt A node_modules/.bin/rc A node_modules/abbrev/LICENSE A node_modules/abbrev/abbrev.js A node_modules/abbrev/package.json M node_modules/accepts/index.js M node_modules/accepts/package.json M node_modules/ajv/.tonic_example.js M node_modules/ajv/dist/ajv.bundle.js M node_modules/ajv/dist/ajv.min.js M node_modules/ajv/dist/ajv.min.js.map M node_modules/ajv/dist/nodent.min.js M node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/$data.js M node_modules/ajv/lib/ajv.d.ts M node_modules/ajv/lib/ajv.js D node_modules/ajv/lib/async.js M node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/async.js M node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/error_classes.js M node_modules/ajv/lib/compile/formats.js M node_modules/ajv/lib/compile/index.js M node_modules/ajv/lib/compile/resolve.js M node_modules/ajv/lib/compile/rules.js M node_modules/ajv/lib/compile/util.js D node_modules/ajv/lib/compile/validation_error.js M node_modules/ajv/lib/dot/_limit.jst M node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/const.jst A node_modules/ajv/lib/dot/contains.jst M node_modules/ajv/lib/dot/custom.jst M node_modules/ajv/lib/dot/definitions.def M node_modules/ajv/lib/dot/dependencies.jst M node_modules/ajv/lib/dot/errors.def M node_modules/ajv/lib/dot/format.jst M node_modules/ajv/lib/dot/items.jst M node_modules/ajv/lib/dot/missing.def M node_modules/ajv/lib/dot/oneOf.jst M node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/propertyNames.jst M node_modules/ajv/lib/dot/ref.jst M node_modules/ajv/lib/dot/required.jst D node_modules/ajv/lib/dot/v5/_formatLimit.jst D node_modules/ajv/lib/dot/v5/constant.jst D node_modules/ajv/lib/dot/v5/patternRequired.jst D node_modules/ajv/lib/dot/v5/switch.jst M node_modules/ajv/lib/dot/validate.jst D node_modules/ajv/lib/dotjs/_formatLimit.js M node_modules/ajv/lib/dotjs/_limit.js M node_modules/ajv/lib/dotjs/_limitItems.js M node_modules/ajv/lib/dotjs/_limitLength.js M node_modules/ajv/lib/dotjs/_limitProperties.js M node_modules/ajv/lib/dotjs/allOf.js M node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/const.js D node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/contains.js M node_modules/ajv/lib/dotjs/custom.js M node_modules/ajv/lib/dotjs/dependencies.js M node_modules/ajv/lib/dotjs/enum.js M node_modules/ajv/lib/dotjs/format.js M node_modules/ajv/lib/dotjs/items.js M node_modules/ajv/lib/dotjs/multipleOf.js M node_modules/ajv/lib/dotjs/not.js M node_modules/ajv/lib/dotjs/oneOf.js M node_modules/ajv/lib/dotjs/pattern.js D node_modules/ajv/lib/dotjs/patternRequired.js M node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/propertyNames.js M node_modules/ajv/lib/dotjs/ref.js M node_modules/ajv/lib/dotjs/required.js D node_modules/ajv/lib/dotjs/switch.js M node_modules/ajv/lib/dotjs/uniqueItems.js M node_modules/ajv/lib/dotjs/validate.js M node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/patternGroups.js A node_modules/ajv/lib/refs/$data.json A node_modules/ajv/lib/refs/json-schema-draft-06.json M node_modules/ajv/lib/refs/json-schema-v5.json D node_modules/ajv/lib/v5.js M node_modules/ajv/package.json M node_modules/ajv/scripts/bundle.js M node_modules/ajv/scripts/compile-dots.js A node_modules/aproba/LICENSE A node_modules/aproba/index.js A node_modules/aproba/package.json A node_modules/are-we-there-yet/LICENSE A node_modules/are-we-there-yet/index.js A node_modules/are-we-there-yet/package.json A node_modules/are-we-there-yet/tracker-base.js A node_modules/are-we-there-yet/tracker-group.js A node_modules/are-we-there-yet/tracker-stream.js A node_modules/are-we-there-yet/tracker.js M node_modules/assert-plus/assert.js M node_modules/assert-plus/package.json M node_modules/aws-sign2/index.js M node_modules/aws-sign2/package.json M node_modules/aws4/package.json A node_modules/block-stream/LICENSE A node_modules/block-stream/block-stream.js A node_modules/block-stream/package.json M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/debuggability.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/util.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/lib/types/text.js M node_modules
[MediaWiki-commits] [Gerrit] mediawiki...recommendation-api[master]: Update to service-template-node v0.5.4
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398020 )
Change subject: Update to service-template-node v0.5.4
..
Update to service-template-node v0.5.4
Bug: T181564
Bug: T180676
Change-Id: Id65e4383aff42192f500efaa70e6045d3ecf939f
---
M .travis.yml
M app.js
M lib/api-util.js
M lib/swagger-ui.js
M lib/util.js
M package.json
M server.js
M test/features/app/app.js
M test/features/app/spec.js
M test/utils/assert.js
M test/utils/logStream.js
M test/utils/server.js
12 files changed, 359 insertions(+), 331 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/.travis.yml b/.travis.yml
index df202fa..b6a9e5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,5 @@
node_js:
- "4"
- "6"
+ - "8"
+ - "node"
diff --git a/app.js b/app.js
index 236a497..eb51fb3 100644
--- a/app.js
+++ b/app.js
@@ -1,17 +1,18 @@
'use strict';
-var http = require('http');
-var BBPromise = require('bluebird');
-var express = require('express');
-var compression = require('compression');
-var bodyParser = require('body-parser');
-var fs = BBPromise.promisifyAll(require('fs'));
-var sUtil = require('./lib/util');
-var apiUtil = require('./lib/api-util');
-var translation = require('./lib/translation');
-var packageInfo = require('./package.json');
-var yaml = require('js-yaml');
+const http = require('http');
+const BBPromise = require('bluebird');
+const express = require('express');
+const compression = require('compression');
+const bodyParser = require('body-parser');
+const fs = BBPromise.promisifyAll(require('fs'));
+const sUtil = require('./lib/util');
+const apiUtil = require('./lib/api-util');
+const packageInfo = require('./package.json');
+const yaml = require('js-yaml');
+const addShutdown = require('http-shutdown');
+const translation = require('./lib/translation');
/**
@@ -22,7 +23,7 @@
function initApp(options) {
// the main application object
-var app = express();
+const app = express();
// get the options and make them available in the app
app.logger = options.logger;// the logging device
@@ -31,22 +32,22 @@
app.info = packageInfo; // this app's package info
// ensure some sane defaults
-if(!app.conf.port) { app.conf.port = ; }
-if(!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
-if(app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
-if(app.conf.cors === undefined) { app.conf.cors = '*'; }
-if(app.conf.csp === undefined) {
-app.conf.csp =
-"default-src 'self'; object-src 'none'; media-src *; img-src *;
style-src *; frame-ancestors 'self'";
+if (!app.conf.port) { app.conf.port = ; }
+if (!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
+if (app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
+if (app.conf.cors === undefined) { app.conf.cors = '*'; }
+if (app.conf.csp === undefined) {
+// eslint-disable-next-line max-len
+app.conf.csp = "default-src 'self'; object-src 'none'; media-src *;
img-src *; style-src *; frame-ancestors 'self'";
}
// set outgoing proxy
-if(app.conf.proxy) {
+if (app.conf.proxy) {
process.env.HTTP_PROXY = app.conf.proxy;
// if there is a list of domains which should
// not be proxied, set it
-if(app.conf.no_proxy_list) {
-if(Array.isArray(app.conf.no_proxy_list)) {
+if (app.conf.no_proxy_list) {
+if (Array.isArray(app.conf.no_proxy_list)) {
process.env.NO_PROXY = app.conf.no_proxy_list.join(',');
} else {
process.env.NO_PROXY = app.conf.no_proxy_list;
@@ -55,15 +56,15 @@
}
// set up header whitelisting for logging
-if(!app.conf.log_header_whitelist) {
+if (!app.conf.log_header_whitelist) {
app.conf.log_header_whitelist = [
-'cache-control', 'content-type', 'content-length', 'if-match',
-'user-agent', 'x-request-id'
+'cache-control', 'content-type', 'content-length', 'if-match',
+'user-agent', 'x-request-id'
];
}
-app.conf.log_header_whitelist = new RegExp('^(?:' +
app.conf.log_header_whitelist.map(function(item) {
+app.conf.log_header_whitelist = new
RegExp(`^(?:${app.conf.log_header_whitelist.map((item) => {
return item.trim();
-}).join('|') + ')$', 'i');
+}).join('|')})$`, 'i');
// set up the request templates for the APIs
apiUtil.setupApiTemplates(app);
@@ -71,21 +72,21 @@
translation.setupTemplates(app);
// set up the spec
-if(!app.conf.spec) {
-app.conf.spec = __dirname + '/spec.yaml';
+if (!app.conf.spec) {
+app.conf.spec = `${__dirname}/spec.yaml`;
}
-if(app.conf.spec.constructor !== Object) {
+if (app.conf.s
[MediaWiki-commits] [Gerrit] mediawiki...recommendation-api[master]: Update to service-template-node v0.5.4
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398020 )
Change subject: Update to service-template-node v0.5.4
..
Update to service-template-node v0.5.4
Bug: T181564
Bug: T180676
Change-Id: Id65e4383aff42192f500efaa70e6045d3ecf939f
---
M .travis.yml
M app.js
M lib/api-util.js
M lib/swagger-ui.js
M lib/util.js
M package.json
M server.js
M test/features/app/app.js
M test/features/app/spec.js
M test/utils/assert.js
M test/utils/logStream.js
M test/utils/server.js
12 files changed, 359 insertions(+), 331 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/services/recommendation-api
refs/changes/20/398020/1
diff --git a/.travis.yml b/.travis.yml
index df202fa..b6a9e5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,5 @@
node_js:
- "4"
- "6"
+ - "8"
+ - "node"
diff --git a/app.js b/app.js
index 236a497..eb51fb3 100644
--- a/app.js
+++ b/app.js
@@ -1,17 +1,18 @@
'use strict';
-var http = require('http');
-var BBPromise = require('bluebird');
-var express = require('express');
-var compression = require('compression');
-var bodyParser = require('body-parser');
-var fs = BBPromise.promisifyAll(require('fs'));
-var sUtil = require('./lib/util');
-var apiUtil = require('./lib/api-util');
-var translation = require('./lib/translation');
-var packageInfo = require('./package.json');
-var yaml = require('js-yaml');
+const http = require('http');
+const BBPromise = require('bluebird');
+const express = require('express');
+const compression = require('compression');
+const bodyParser = require('body-parser');
+const fs = BBPromise.promisifyAll(require('fs'));
+const sUtil = require('./lib/util');
+const apiUtil = require('./lib/api-util');
+const packageInfo = require('./package.json');
+const yaml = require('js-yaml');
+const addShutdown = require('http-shutdown');
+const translation = require('./lib/translation');
/**
@@ -22,7 +23,7 @@
function initApp(options) {
// the main application object
-var app = express();
+const app = express();
// get the options and make them available in the app
app.logger = options.logger;// the logging device
@@ -31,22 +32,22 @@
app.info = packageInfo; // this app's package info
// ensure some sane defaults
-if(!app.conf.port) { app.conf.port = ; }
-if(!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
-if(app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
-if(app.conf.cors === undefined) { app.conf.cors = '*'; }
-if(app.conf.csp === undefined) {
-app.conf.csp =
-"default-src 'self'; object-src 'none'; media-src *; img-src *;
style-src *; frame-ancestors 'self'";
+if (!app.conf.port) { app.conf.port = ; }
+if (!app.conf.interface) { app.conf.interface = '0.0.0.0'; }
+if (app.conf.compression_level === undefined) { app.conf.compression_level
= 3; }
+if (app.conf.cors === undefined) { app.conf.cors = '*'; }
+if (app.conf.csp === undefined) {
+// eslint-disable-next-line max-len
+app.conf.csp = "default-src 'self'; object-src 'none'; media-src *;
img-src *; style-src *; frame-ancestors 'self'";
}
// set outgoing proxy
-if(app.conf.proxy) {
+if (app.conf.proxy) {
process.env.HTTP_PROXY = app.conf.proxy;
// if there is a list of domains which should
// not be proxied, set it
-if(app.conf.no_proxy_list) {
-if(Array.isArray(app.conf.no_proxy_list)) {
+if (app.conf.no_proxy_list) {
+if (Array.isArray(app.conf.no_proxy_list)) {
process.env.NO_PROXY = app.conf.no_proxy_list.join(',');
} else {
process.env.NO_PROXY = app.conf.no_proxy_list;
@@ -55,15 +56,15 @@
}
// set up header whitelisting for logging
-if(!app.conf.log_header_whitelist) {
+if (!app.conf.log_header_whitelist) {
app.conf.log_header_whitelist = [
-'cache-control', 'content-type', 'content-length', 'if-match',
-'user-agent', 'x-request-id'
+'cache-control', 'content-type', 'content-length', 'if-match',
+'user-agent', 'x-request-id'
];
}
-app.conf.log_header_whitelist = new RegExp('^(?:' +
app.conf.log_header_whitelist.map(function(item) {
+app.conf.log_header_whitelist = new
RegExp(`^(?:${app.conf.log_header_whitelist.map((item) => {
return item.trim();
-}).join('|') + ')$', 'i');
+}).join('|')})$`, 'i');
// set up the request templates for the APIs
apiUtil.setupApiTemplates(app);
@@ -71,21 +72,21 @@
translation.setupTemplates(app);
// set up the spec
-if(!app.conf.spec) {
-app.conf.spec = __dirname + '/spec.yaml';
+if (!app.conf.spec) {
+app.conf.spec = `${__dirname}/spec.yaml`;
}
-if(app.conf.spec.const
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Reduce delete probability to 25%
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398011 ) Change subject: Config: Reduce delete probability to 25% .. Config: Reduce delete probability to 25% Now that all of the most high-traffic end points have been migrated, we should start taking advantage of Cassandra's range deletes in a more efficient manner. Hence, reduce the delete probability from 100% on each request to 25%. This should alleviate some of the load on the Cassandra 3 cluster. Bug: T179416 Change-Id: I5faca4292dd589684f6df159cf8a1702659830a1 --- M scap/templates/config.yaml.j2 M scap/vars.yaml 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/11/398011/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 4a4c90f..d6e8caa 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -99,6 +99,7 @@ parsoid: host: <%= parsoid_uri %> grace_ttl: 86400 + delete_probability: <%= delete_probability %> <% if new_storage_enabled_parsoid is not none and new_storage_enabled_parsoid|length > 0 %>backends: new:<% for item in new_storage_enabled_parsoid %> - '<%= item %>' diff --git a/scap/vars.yaml b/scap/vars.yaml index 167257e..10a3751 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -31,6 +31,7 @@ trendingedits_uri: https://trending-beta.wmflabs.org cxserver_uri: https://cxserver-beta.wmflabs.org aqs_uri: https://wikimedia.org/api/rest_v1/metrics +delete_probability: 0.25 new_storage_enabled_parsoid: - /.*/ port: 7231 -- To view, visit https://gerrit.wikimedia.org/r/398011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5faca4292dd589684f6df159cf8a1702659830a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Config: Use MCS for summaries in all environments"
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397915 ) Change subject: Revert "Config: Use MCS for summaries in all environments" .. Revert "Config: Use MCS for summaries in all environments" This reverts commit 533c24ccd69f741ea3aa2aefec478620172f80b9. Change-Id: I205b771b37a813559fcdc390c351da4966cfc1b1 --- M scap/environments/beta/vars.yaml M scap/vars.yaml 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved Ppchelko: Looks good to me, but someone else must approve diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index 03d1f93..469ce1b 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -7,6 +7,7 @@ cassandra_default_consistency: localOne new_storage_enabled_parsoid: - '/.*/' +summary_impl: mcs domains: BetaCluster: aa.wikipedia.beta.wmflabs.org: default_project diff --git a/scap/vars.yaml b/scap/vars.yaml index 777cdf0..167257e 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -69,7 +69,7 @@ domains: /^wikimedia\.org$/ - name: wikipedia domains: /\.wikipedia\.org$/ -summary_impl: mcs +summary_impl: mwapi domains: Wikipedia: ab.wikipedia.org: default_project -- To view, visit https://gerrit.wikimedia.org/r/397915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I205b771b37a813559fcdc390c351da4966cfc1b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Config: Use MCS for summaries in all environments"
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397915 ) Change subject: Revert "Config: Use MCS for summaries in all environments" .. Revert "Config: Use MCS for summaries in all environments" This reverts commit 533c24ccd69f741ea3aa2aefec478620172f80b9. Change-Id: I205b771b37a813559fcdc390c351da4966cfc1b1 --- M scap/environments/beta/vars.yaml M scap/vars.yaml 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/15/397915/1 diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index 03d1f93..469ce1b 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -7,6 +7,7 @@ cassandra_default_consistency: localOne new_storage_enabled_parsoid: - '/.*/' +summary_impl: mcs domains: BetaCluster: aa.wikipedia.beta.wmflabs.org: default_project diff --git a/scap/vars.yaml b/scap/vars.yaml index 777cdf0..167257e 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -69,7 +69,7 @@ domains: /^wikimedia\.org$/ - name: wikipedia domains: /\.wikipedia\.org$/ -summary_impl: mcs +summary_impl: mwapi domains: Wikipedia: ab.wikipedia.org: default_project -- To view, visit https://gerrit.wikimedia.org/r/397915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I205b771b37a813559fcdc390c351da4966cfc1b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Do not monitor page/news
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397908 ) Change subject: Do not monitor page/news .. Do not monitor page/news Change-Id: I282ed985e3c54415df104ac3280f3eea710d44a3 --- M spec.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/spec.yaml b/spec.yaml index 13c478b..0d42039 100644 --- a/spec.yaml +++ b/spec.yaml @@ -540,7 +540,8 @@ description: Error schema: $ref: '#/definitions/problem' - x-amples: + x-monitor: false +# x-amples: #- title: get 'In the News' content # response: #status: 200 -- To view, visit https://gerrit.wikimedia.org/r/397908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I282ed985e3c54415df104ac3280f3eea710d44a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Do not monitor page/news
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397908 ) Change subject: Do not monitor page/news .. Do not monitor page/news Change-Id: I282ed985e3c54415df104ac3280f3eea710d44a3 --- M spec.yaml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps refs/changes/08/397908/1 diff --git a/spec.yaml b/spec.yaml index 13c478b..0d42039 100644 --- a/spec.yaml +++ b/spec.yaml @@ -540,7 +540,8 @@ description: Error schema: $ref: '#/definitions/problem' - x-amples: + x-monitor: false +# x-amples: #- title: get 'In the News' content # response: #status: 200 -- To view, visit https://gerrit.wikimedia.org/r/397908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I282ed985e3c54415df104ac3280f3eea710d44a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Temporarily skip throwIfPreviousSectionIsIncomplete
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397905 )
Change subject: Temporarily skip throwIfPreviousSectionIsIncomplete
..
Temporarily skip throwIfPreviousSectionIsIncomplete
Skip checking for section.line and section.anchor in order to complete
our coordinated deployment. We'll come back and fix this asap.
Change-Id: I88c08d4636803d64e51835067dd75164f68a8eb5
---
M lib/parsoidSectionsUsingSectionTags.js
M spec.yaml
M test/diff/diff.js
M test/features/news/news.js
M test/lib/parsoid/parsoid-sections-section-elements-tests.js
5 files changed, 27 insertions(+), 27 deletions(-)
Approvals:
Mobrovac: Verified
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/lib/parsoidSectionsUsingSectionTags.js
b/lib/parsoidSectionsUsingSectionTags.js
index 7d20fdd..76e471d 100644
--- a/lib/parsoidSectionsUsingSectionTags.js
+++ b/lib/parsoidSectionsUsingSectionTags.js
@@ -1,8 +1,8 @@
'use strict';
const parsoidDomUtils = require('parsoid-dom-utils');
-const sUtil = require('./util');
-const HTTPError = sUtil.HTTPError;
+// const sUtil = require('./util');
+// const HTTPError = sUtil.HTTPError;
const NodeType = require('./nodeType');
/**
@@ -39,7 +39,7 @@
}
}
-function throwIfPreviousSectionIsIncomplete(allSections, sectionObj) {
+/* function throwIfPreviousSectionIsIncomplete(allSections, sectionObj) {
if (allSections.length === 0) {
return;
}
@@ -57,7 +57,7 @@
detail: `Cannot find heading for section number ${sectionObj.id}.`
});
}
-}
+} */
/**
* Visits one DOM node. Do the stuff that needs to be done when a single DOM
node is handled.
@@ -70,7 +70,7 @@
function visit(node, allSections, state) {
let sectionObj = allSections.length > 0 ? allSections[allSections.length -
1] : undefined;
if (node.tagName === 'SECTION') {
-throwIfPreviousSectionIsIncomplete(allSections, sectionObj);
+// throwIfPreviousSectionIsIncomplete(allSections, sectionObj);
sectionObj = { id: getSectionNumber(node), text: '' };
allSections.push(sectionObj);
@@ -117,7 +117,7 @@
}
}
ensureLeadSection(allSections);
-throwIfPreviousSectionIsIncomplete(allSections);
+// throwIfPreviousSectionIsIncomplete(allSections);
}
function getSectionsText(doc) {
diff --git a/spec.yaml b/spec.yaml
index 1850994..13c478b 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -541,24 +541,24 @@
schema:
$ref: '#/definitions/problem'
x-amples:
-- title: get 'In the News' content
- response:
-status: 200
-headers:
- content-type: application/json
-body:
- - story: /.+/
-links:
- - $merge: [ /.+/ ]
-- title: get 'In the News' content for unsupported language (with
aggregated=true)
- request:
-params:
- domain: "is.wikipedia.org"
-query:
- aggregated: true
- response:
-status: 204
-body: ""
+#- title: get 'In the News' content
+# response:
+#status: 200
+#headers:
+# content-type: application/json
+#body:
+# - story: /.+/
+#links:
+# - $merge: [ /.+/ ]
+#- title: get 'In the News' content for unsupported language (with
aggregated=true)
+# request:
+#params:
+# domain: "is.wikipedia.org"
+#query:
+# aggregated: true
+# response:
+#status: 204
+#body: ""
# from routes/media.js
/{domain}/v1/page/media/{title}:
diff --git a/test/diff/diff.js b/test/diff/diff.js
index dc3075f..0636b43 100644
--- a/test/diff/diff.js
+++ b/test/diff/diff.js
@@ -6,7 +6,7 @@
const server = require('../utils/server.js');
const testSpec = require('./test-spec');
-describe('diff', function() {
+describe.skip('diff', function() {
this.timeout(2); // eslint-disable-line no-invalid-this
diff --git a/test/features/news/news.js b/test/features/news/news.js
index 36f9997..508a1ad 100644
--- a/test/features/news/news.js
+++ b/test/features/news/news.js
@@ -43,7 +43,7 @@
};
-describe('in the news', function() {
+describe.skip('in the news', function() {
this.timeout(2); // eslint-disable-line no-invalid-this
diff --git a/test/lib/parsoid/parsoid-sections-section-elements-tests.js
b/test/lib/parsoid/parsoid-sections-section-elements-tests.js
index 4ba24df..77cb023 100644
--- a/test/lib/parsoid/parsoid-sections-section-elements-tests.js
+++ b/test/lib/parsoid/parsoid-sections-section-elements-tests.js
@@ -119,7 +119,7 @@
assertSection0(sections, sectionInDiv);
});
-it('non-lead section without heading tag should throw error', (
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to a70a130
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397900 ) Change subject: Update restbase to a70a130 .. Update restbase to a70a130 List of changes: a70a130 Remove falling back to old storage for non-found pagebundle Change-Id: If8d62f3fed8fa458ca2be7c3069d28bcf734ee6a --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 220dfbd..a70a130 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 220dfbd2dc76b6d3dc97d5cdb58e54cc6135776f +Subproject commit a70a130221378ea7c4cb100b5d0d86c456797fef -- To view, visit https://gerrit.wikimedia.org/r/397900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8d62f3fed8fa458ca2be7c3069d28bcf734ee6a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to a70a130
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397900 ) Change subject: Update restbase to a70a130 .. Update restbase to a70a130 List of changes: a70a130 Remove falling back to old storage for non-found pagebundle Change-Id: If8d62f3fed8fa458ca2be7c3069d28bcf734ee6a --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/00/397900/1 diff --git a/restbase b/restbase index 220dfbd..a70a130 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 220dfbd2dc76b6d3dc97d5cdb58e54cc6135776f +Subproject commit a70a130221378ea7c4cb100b5d0d86c456797fef -- To view, visit https://gerrit.wikimedia.org/r/397900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8d62f3fed8fa458ca2be7c3069d28bcf734ee6a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Enable new storage for Parsoid for all domains
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396473 ) Change subject: [Config] Enable new storage for Parsoid for all domains .. [Config] Enable new storage for Parsoid for all domains Bug: T179417 Change-Id: I0f2b15c7bd9f3a4378d63b53d0bedf3df8f84fe9 --- M scap/vars.yaml 1 file changed, 1 insertion(+), 10 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/vars.yaml b/scap/vars.yaml index 5081458..167257e 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -32,16 +32,7 @@ cxserver_uri: https://cxserver-beta.wmflabs.org aqs_uri: https://wikimedia.org/api/rest_v1/metrics new_storage_enabled_parsoid: - - /^(?:test.*\.wiki.*\.org|www.mediawiki.org)$/ - - /\.wikimedia\.org$/ - - /\.wiktionary\.org$/ - - /\.wikibooks\.org$/ - - /\.wikisource\.org$/ - - /\.wikiquote\.org$/ - - /\.wikinews\.org$/ - - /\.wikiversity\.org$/ - - /\.wikivoyage\.org$/ - - /\.wikidata\.org$/ + - /.*/ port: 7231 salt_key: '123456' page_size: 10 -- To view, visit https://gerrit.wikimedia.org/r/396473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f2b15c7bd9f3a4378d63b53d0bedf3df8f84fe9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Ppchelko Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko Gerrit-Reviewer: Subramanya Sastry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Use MCS for summaries in all environments
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397824 ) Change subject: Config: Use MCS for summaries in all environments .. Config: Use MCS for summaries in all environments Bug: T179875 Change-Id: I27efe6ab31952d2f79b769d46cc682928df436cb --- M scap/environments/beta/vars.yaml M scap/vars.yaml 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved Ppchelko: Looks good to me, but someone else must approve diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index 469ce1b..03d1f93 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -7,7 +7,6 @@ cassandra_default_consistency: localOne new_storage_enabled_parsoid: - '/.*/' -summary_impl: mcs domains: BetaCluster: aa.wikipedia.beta.wmflabs.org: default_project diff --git a/scap/vars.yaml b/scap/vars.yaml index 5081458..046d96e 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -78,7 +78,7 @@ domains: /^wikimedia\.org$/ - name: wikipedia domains: /\.wikipedia\.org$/ -summary_impl: mwapi +summary_impl: mcs domains: Wikipedia: ab.wikipedia.org: default_project -- To view, visit https://gerrit.wikimedia.org/r/397824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27efe6ab31952d2f79b769d46cc682928df436cb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 220dfbd
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397897 ) Change subject: Update restbase to 220dfbd .. Update restbase to 220dfbd List of changes: da0bcfe Bump Parsoid html version to 1.6.0 ec60393 Update section tests to match new parsoid output bfd2a05 Rolled back the body_only test change as it will fix itself after parsoid deploy in beta cluster 220dfbd Update section IDs for Main_Page Change-Id: Ifcb0d4b25498930b909a6c82ba36e0c3d9236732 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 289c64a..220dfbd 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 289c64aed98b6e90d4364d518c22fc683dba9ac9 +Subproject commit 220dfbd2dc76b6d3dc97d5cdb58e54cc6135776f -- To view, visit https://gerrit.wikimedia.org/r/397897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcb0d4b25498930b909a6c82ba36e0c3d9236732 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 220dfbd
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397897 ) Change subject: Update restbase to 220dfbd .. Update restbase to 220dfbd List of changes: da0bcfe Bump Parsoid html version to 1.6.0 ec60393 Update section tests to match new parsoid output bfd2a05 Rolled back the body_only test change as it will fix itself after parsoid deploy in beta cluster 220dfbd Update section IDs for Main_Page Change-Id: Ifcb0d4b25498930b909a6c82ba36e0c3d9236732 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/97/397897/1 diff --git a/restbase b/restbase index 289c64a..220dfbd 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 289c64aed98b6e90d4364d518c22fc683dba9ac9 +Subproject commit 220dfbd2dc76b6d3dc97d5cdb58e54cc6135776f -- To view, visit https://gerrit.wikimedia.org/r/397897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcb0d4b25498930b909a6c82ba36e0c3d9236732 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Use MCS for summaries in all environments
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397824 ) Change subject: Config: Use MCS for summaries in all environments .. Config: Use MCS for summaries in all environments Bug: T179875 Change-Id: I27efe6ab31952d2f79b769d46cc682928df436cb --- M scap/environments/beta/vars.yaml M scap/vars.yaml 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/24/397824/1 diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index 469ce1b..03d1f93 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -7,7 +7,6 @@ cassandra_default_consistency: localOne new_storage_enabled_parsoid: - '/.*/' -summary_impl: mcs domains: BetaCluster: aa.wikipedia.beta.wmflabs.org: default_project diff --git a/scap/vars.yaml b/scap/vars.yaml index 5081458..046d96e 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -78,7 +78,7 @@ domains: /^wikimedia\.org$/ - name: wikipedia domains: /\.wikipedia\.org$/ -summary_impl: mwapi +summary_impl: mcs domains: Wikipedia: ab.wikipedia.org: default_project -- To view, visit https://gerrit.wikimedia.org/r/397824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27efe6ab31952d2f79b769d46cc682928df436cb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Remove 'pattern' for request_id from schemas.
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397709 )
Change subject: Remove 'pattern' for request_id from schemas.
..
Remove 'pattern' for request_id from schemas.
In MediaWiki the request_id is actually a 26-symbols-long
random string obtained with WebRequest::getRequestID(), however
EventBus for some reason uses some custom method of obtaining the
request ID. However, seems like that metod always fails and defaults
to a v1 UUID - including that doesn't have anything in common with
the actual MediaWiki request ID.
As MediaWiki request ID will have different pattern then RESTBase
request id, so we just remove the pattern.
Change-Id: Ieab17db6f7ed1a7d37ee801d581791a240bbe74b
---
M jsonschema/change-prop/continue/1.yaml
M jsonschema/change-prop/retry/1.yaml
M jsonschema/error/1.yaml
M jsonschema/mediawiki/job/1.yaml
M jsonschema/mediawiki/page/delete/2.yaml
M jsonschema/mediawiki/page/move/1.yaml
M jsonschema/mediawiki/page/move/2.yaml
M jsonschema/mediawiki/page/properties-change/1.yaml
M jsonschema/mediawiki/page/restrictions-change/1.yaml
M jsonschema/mediawiki/page/undelete/2.yaml
M jsonschema/mediawiki/recentchange/1.yaml
M jsonschema/mediawiki/revision/create/2.yaml
M jsonschema/mediawiki/revision/visibility-change/1.yaml
M jsonschema/mediawiki/user/blocks-change/1.yaml
M jsonschema/resource_change/1.yaml
M jsonschema/test/event/1.yaml
M test/jsonschema/index.js
M test/jsonschema/meta_common_schema.yaml
18 files changed, 18 insertions(+), 33 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/jsonschema/change-prop/continue/1.yaml
b/jsonschema/change-prop/continue/1.yaml
index ae5f67c..abc0098 100644
--- a/jsonschema/change-prop/continue/1.yaml
+++ b/jsonschema/change-prop/continue/1.yaml
@@ -23,8 +23,7 @@
description: the unique URI identifying the event / resource
request_id:
type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
-description: the unique UUID v1 ID of the event derived from the
X-Request-Id header
+description: The unique ID of the request that caused the event.
id:
type: string
pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
diff --git a/jsonschema/change-prop/retry/1.yaml
b/jsonschema/change-prop/retry/1.yaml
index 1d0be6b..9c4d6c8 100644
--- a/jsonschema/change-prop/retry/1.yaml
+++ b/jsonschema/change-prop/retry/1.yaml
@@ -23,8 +23,7 @@
description: the unique URI identifying the event / resource
request_id:
type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
-description: the unique UUID v1 ID of the event derived from the
X-Request-Id header
+description: The unique ID of the request that caused the event.
id:
type: string
pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
diff --git a/jsonschema/error/1.yaml b/jsonschema/error/1.yaml
index 5734d0a..1efd211 100644
--- a/jsonschema/error/1.yaml
+++ b/jsonschema/error/1.yaml
@@ -23,8 +23,7 @@
description: the unique URI identifying the event / resource
request_id:
type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
-description: the unique UUID v1 ID of the event derived from the
X-Request-Id header
+description: The unique ID of the request that caused the event.
id:
type: string
pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
diff --git a/jsonschema/mediawiki/job/1.yaml b/jsonschema/mediawiki/job/1.yaml
index 1517323..107c0b4 100644
--- a/jsonschema/mediawiki/job/1.yaml
+++ b/jsonschema/mediawiki/job/1.yaml
@@ -23,7 +23,7 @@
type: string
format: uri
request_id:
-description: The unique UUID v1 ID of the event derived from the
X-Request-Id header.
+description: The unique ID of the request that caused the event.
type: string
pattern: '^[a-zA-Z0-9\-@]+$'
id:
diff --git a/jsonschema/mediawiki/page/delete/2.yaml
b/jsonschema/mediawiki/page/delete/2.yaml
index 65e35e8..51acc02 100644
--- a/jsonschema/mediawiki/page/delete/2.yaml
+++ b/jsonschema/mediawiki/page/delete/2.yaml
@@ -22,9 +22,8 @@
type: string
format: uri
request_id:
-description: The unique UUID v1 ID of the event derived from the
X-Request-Id header.
+description: The unique ID of the request that caused the event.
type: string
-pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
id:
description: The unique ID of this event; should match the dt field.
type: string
diff --git a/jsonschema/mediawiki/page/move/1.yaml
b/jsonschema/media
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ef54e7b
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397610 ) Change subject: Update restbase to ef54e7b .. Update restbase to ef54e7b List of changes: ef54e7b Reading Lists: Do not monitor any end point Change-Id: I093fcb938872f6ca49a4f87c431f51aceffecd25 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 5ad5b32..ef54e7b 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 5ad5b32d484369ae67de1d4737a2e6061c4ec71a +Subproject commit ef54e7b54954535152aaf4782df840c9310764f4 -- To view, visit https://gerrit.wikimedia.org/r/397610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I093fcb938872f6ca49a4f87c431f51aceffecd25 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ef54e7b
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397610 ) Change subject: Update restbase to ef54e7b .. Update restbase to ef54e7b List of changes: ef54e7b Reading Lists: Do not monitor any end point Change-Id: I093fcb938872f6ca49a4f87c431f51aceffecd25 --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/10/397610/1 diff --git a/restbase b/restbase index 5ad5b32..ef54e7b 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 5ad5b32d484369ae67de1d4737a2e6061c4ec71a +Subproject commit ef54e7b54954535152aaf4782df840c9310764f4 -- To view, visit https://gerrit.wikimedia.org/r/397610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I093fcb938872f6ca49a4f87c431f51aceffecd25 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 5ad5b32
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397605 ) Change subject: Update restbase to 5ad5b32 .. Update restbase to 5ad5b32 List of changes: 994e5af Add ReadingLists proxy b1f2f64 Hydrate summaries 47a9b88 Reading lists: fix content type for endpoints which return no data 275eae8 Reading lists: fix cache header f1c5531 Reading lists: fix response schema for POST requests a01980a Reading lists: fix handling of continuation decoding errors d76702f Reading lists: return 400 for errors related to invalid input cf95c65 Reading lists: normalize the title for summary fetches ae33343 Reading lists: fix response format for order endpoints fac8286 Remove order-related information dfb04f7 Reading lists: add sorting ecd1948 Remove color/image/icon 5ad5b32 Reading lists: fix error definitions Change-Id: Ie2b44a048a5e5e6d4bbced1d74018036b56f01bd --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 316f10d..5ad5b32 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 316f10dc4daf075e3222b0d3d8587e76ed5bacb9 +Subproject commit 5ad5b32d484369ae67de1d4737a2e6061c4ec71a -- To view, visit https://gerrit.wikimedia.org/r/397605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2b44a048a5e5e6d4bbced1d74018036b56f01bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 5ad5b32
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397605 ) Change subject: Update restbase to 5ad5b32 .. Update restbase to 5ad5b32 List of changes: 994e5af Add ReadingLists proxy b1f2f64 Hydrate summaries 47a9b88 Reading lists: fix content type for endpoints which return no data 275eae8 Reading lists: fix cache header f1c5531 Reading lists: fix response schema for POST requests a01980a Reading lists: fix handling of continuation decoding errors d76702f Reading lists: return 400 for errors related to invalid input cf95c65 Reading lists: normalize the title for summary fetches ae33343 Reading lists: fix response format for order endpoints fac8286 Remove order-related information dfb04f7 Reading lists: add sorting ecd1948 Remove color/image/icon 5ad5b32 Reading lists: fix error definitions Change-Id: Ie2b44a048a5e5e6d4bbced1d74018036b56f01bd --- M restbase 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/05/397605/1 diff --git a/restbase b/restbase index 316f10d..5ad5b32 16 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 316f10dc4daf075e3222b0d3d8587e76ed5bacb9 +Subproject commit 5ad5b32d484369ae67de1d4737a2e6061c4ec71a -- To view, visit https://gerrit.wikimedia.org/r/397605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2b44a048a5e5e6d4bbced1d74018036b56f01bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Enable htmlCacheUpdate for ceb and ru wiki plus all...
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397585 ) Change subject: [Config] Enable htmlCacheUpdate for ceb and ru wiki plus all small projects .. [Config] Enable htmlCacheUpdate for ceb and ru wiki plus all small projects Bug: T182023 Depends-On: Ie2f13141f5766801d3d3169a70b976b44a177830 Change-Id: I3af0e253299e6fa6126edb9ed8901a6164d270ff --- M scap/templates/config.yaml.j2 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index a1a92d2..7b8140a 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -55,7 +55,7 @@ topic: 'mediawiki.job.htmlCacheUpdate' match: meta: -domain: '/.*\.wiktionary\.org$/' +domain: '/(?:^ceb\.wikipedia\.org$)|(?:^ru\.wikipedia\.org$)|(?:.*\.wikibooks\.org$)|(?:.*\.wikinews\.org$)|(?:.*\.wikiquote\.org$)|(?:.*\.wikisource\.org$)|(?:.*\.wikiversity\.org$)|(?:.*\.wikivoyage\.org$)|(?:.*\.wiktionary\.org$)/' exec: method: post uri: '<%= jobrunner_uri %>' -- To view, visit https://gerrit.wikimedia.org/r/397585 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3af0e253299e6fa6126edb9ed8901a6164d270ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy Gerrit-Branch: master Gerrit-Owner: Ppchelko Gerrit-Reviewer: Elukey Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Blubber: update deps for node-gyp compilation
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395050 )
Change subject: Blubber: update deps for node-gyp compilation
..
Blubber: update deps for node-gyp compilation
Change-Id: I43f9df70540c6645a95d0b210cb91597a0dfd582
---
M dist/pipeline/blubber.yaml
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Thcipriani: Looks good to me, but someone else must approve
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/dist/pipeline/blubber.yaml b/dist/pipeline/blubber.yaml
index 6659ef1..d7c1ef9 100644
--- a/dist/pipeline/blubber.yaml
+++ b/dist/pipeline/blubber.yaml
@@ -10,8 +10,9 @@
variants:
build:
base: docker-registry.wikimedia.org/nodejs-devel
-apt: { packages: [librsvg2-dev, git] }
+apt: { packages: [librsvg2-dev, git, python-pkgconfig, build-essential] }
node: { dependencies: true }
+runs: { environment: { LINK: g++ } }
development:
includes: [build]
entrypoint: [node, server.js]
--
To view, visit https://gerrit.wikimedia.org/r/395050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f9df70540c6645a95d0b210cb91597a0dfd582
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Thcipriani
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove the Trending Edits service from production
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397571 ) Change subject: Remove the Trending Edits service from production .. Remove the Trending Edits service from production Change-Id: I79b620fb437821a03361e637b489bd7f9f7dbb73 Depends-On: I01cc708fdfe1a6c6620e72c36f0c1a1410baf5be Bug: T180384 --- M conftool-data/discovery/services.yaml M conftool-data/node/codfw.yaml M conftool-data/node/eqiad.yaml M conftool-data/service/services.yaml M hieradata/common/discovery.yaml M hieradata/common/lvs/configuration.yaml M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/deployment_server.yaml M hieradata/role/common/restbase/dev_cluster.yaml M hieradata/role/common/restbase/production.yaml M hieradata/role/common/restbase/test_cluster.yaml M hieradata/role/common/scb.yaml M modules/admin/data/data.yaml M modules/profile/manifests/restbase.pp D modules/profile/manifests/trendingedits.pp M modules/role/manifests/scb.pp D modules/role/manifests/trendingedits.pp 17 files changed, 11 insertions(+), 108 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/397571/1 diff --git a/conftool-data/discovery/services.yaml b/conftool-data/discovery/services.yaml index 3628a24..886e45a 100644 --- a/conftool-data/discovery/services.yaml +++ b/conftool-data/discovery/services.yaml @@ -17,7 +17,6 @@ mobileapps: [eqiad, codfw] ores: [eqiad, codfw] pdfrender: [eqiad, codfw] -trendingedits: [eqiad, codfw] "recommendation-api": [eqiad, codfw] wdqs: [eqiad, codfw] zotero: [eqiad, codfw] diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml index 0469398..2a07250 100644 --- a/conftool-data/node/codfw.yaml +++ b/conftool-data/node/codfw.yaml @@ -281,12 +281,12 @@ sca2003.codfw.wmnet: [zotero] sca2004.codfw.wmnet: [zotero] scb: -scb2001.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb2002.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb2003.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb2004.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb2005.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb2006.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] +scb2001.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb2002.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb2003.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb2004.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb2005.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb2006.codfw.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] eventbus: kafka2001.codfw.wmnet: [eventbus] kafka2002.codfw.wmnet: [eventbus] diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml index 83e79e6..1fc4675 100644 --- a/conftool-data/node/eqiad.yaml +++ b/conftool-data/node/eqiad.yaml @@ -168,10 +168,10 @@ sca1003.eqiad.wmnet: [zotero] sca1004.eqiad.wmnet: [zotero] scb: -scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb1003.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] -scb1004.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, trendingedits, "recommendation-api"] +scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, apertium, cxserver, ores, eventstreams, pdfrender, "recommendation-api"] +scb1003.eqiad.wmnet: [mobile
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Remove the Trending Edits options and URI
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397567 ) Change subject: Config: Remove the Trending Edits options and URI .. Config: Remove the Trending Edits options and URI Cannot be merged before https://github.com/wikimedia/restbase/pull/927 Bug: T180384 Change-Id: I01cc708fdfe1a6c6620e72c36f0c1a1410baf5be --- M scap/templates/config.yaml.j2 M scap/vars.yaml 2 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/67/397567/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 4a4c90f..901a891 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -145,11 +145,7 @@ en.wikipedia.org: &en.wikipedia.org x-modules: - path: projects/wmf_enwiki.yaml - options: -<<: *default_options -trending: - host: <%= trendingedits_uri %> - cache_control: s-maxage=300, max-age=60 + options: *default_options # A different project template, sharing configuration options. wikimedia.org: &wikimedia.org diff --git a/scap/vars.yaml b/scap/vars.yaml index 5081458..63b3ea2 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -28,7 +28,6 @@ skip_updates: false pdfrender_uri: https://pdfrender-beta.wmflabs.org pdfrender_key: secret -trendingedits_uri: https://trending-beta.wmflabs.org cxserver_uri: https://cxserver-beta.wmflabs.org aqs_uri: https://wikimedia.org/api/rest_v1/metrics new_storage_enabled_parsoid: -- To view, visit https://gerrit.wikimedia.org/r/397567 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01cc708fdfe1a6c6620e72c36f0c1a1410baf5be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
