Merge a59016e into 6549469

wikimedia · Sep 18, 2019 · 0de3ca7 · 0de3ca7
2 parents 6549469 + a59016e
commit 0de3ca7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/config.frontend.test.yaml b/config.frontend.test.yaml
@@ -20,11 +20,13 @@ default_project: &default_project
                     # 10 days Varnish caching, one day client-side
                     cache-control: s-maxage=864000, max-age=86400
                   mobileapps:
-                    host: https://appservice.wmflabs.org
+                    host: https://mobileapps.wmflabs.org
+                  wikifeeds:
+                    host: https://wikifeeds.wmflabs.org
                   summary:
                     protocol: https
                     implementation: mcs
-                    host: https://appservice.wmflabs.org
+                    host: https://mobileapps.wmflabs.org
                   citoid:
                     host: https://citoid-beta.wmflabs.org
                   recommendation:

diff --git a/config.fullstack.test.yaml b/config.fullstack.test.yaml
@@ -19,11 +19,13 @@ default_project: &default_project
                     # 10 days Varnish caching, one day client-side
                     cache-control: s-maxage=864000, max-age=86400
                   mobileapps:
-                    host: https://appservice.wmflabs.org
+                    host: https://mobileapps.wmflabs.org
+                  wikifeeds:
+                    host: https://wikifeeds.wmflabs.org
                   summary:
                     protocol: https
                     implementation: mcs
-                    host: https://appservice.wmflabs.org
+                    host: https://mobileapps.wmflabs.org
                   citoid:
                     host: https://citoid-beta.wmflabs.org
                   recommendation:

diff --git a/projects/v1/wikimedia.wmf.yaml b/projects/v1/wikimedia.wmf.yaml
@@ -72,4 +72,4 @@ paths:
   /feed:
     x-modules:
       - path: v1/availability.yaml
-        options: '{{options.mobileapps}}'
+        options: '{{options.wikifeeds}}'
diff --git a/projects/v1/wikipedia.wmf.yaml b/projects/v1/wikipedia.wmf.yaml
@@ -107,11 +107,11 @@ paths:
   /feed:
     x-modules:
       - path: v1/feed.js
-        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.mobileapps)}}'
+        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.wikifeeds)}}'
       - path: v1/announcements.yaml
-        options: '{{merge({"announcement_cache_control": "s-maxage=86400, max-age=86400"}, options.mobileapps)}}'
+        options: '{{merge({"announcement_cache_control": "s-maxage=86400, max-age=86400"}, options.wikifeeds)}}'
       - path: v1/onthisday.js
-        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.mobileapps)}}'
+        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.wikifeeds)}}'
   /transform:
     x-modules:
       - path: v1/transform.yaml

diff --git a/test/features/feed.js b/test/features/feed.js
@@ -5,7 +5,7 @@ const Server = require('../utils/server.js');
 const preq   = require('preq');
 
 function assertMCSRequest(content, date, expected) {
-    const serviceURI = 'https://appservice.wmflabs.org';
+    const serviceURI = 'https://wikifeeds.wmflabs.org';
     let path = `/en.wikipedia.org/v1/${content}`;
     if (date) {
         path += `/${date}`;