Merge 20d7f90 into aa513c1

wikimedia · Jul 25, 2019 · 9848c66 · 9848c66
2 parents aa513c1 + 20d7f90
commit 9848c66
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/config.example.yaml b/config.example.yaml
@@ -3,7 +3,7 @@
 # - sqlite backend
 # - parsoid at http://localhost:8142
 # - wiki at http://localhost/w/api.php
-# 
+#
 # Quick setup:
 # - npm install
 #   If you see errors about sqlite, you might have to `apt-get install
@@ -19,7 +19,7 @@
 services:
   - name: restbase
     module: hyperswitch
-    conf: 
+    conf:
       port: 7231
       salt: secret
       default_page_size: 125
@@ -61,6 +61,9 @@ services:
                     retry_delay: 250
                     retry_limit: 10
                     show_sql: false
+                    storage_groups:
+                      - name: local
+                        domains: /./
                   mobileapps:
                     host: https://appservice.wmflabs.org
                   purged_cache_control: s-maxage=0, max-age=86400

diff --git a/projects/example.yaml b/projects/example.yaml
@@ -25,17 +25,20 @@ paths:
 
   /{api:sys}:
     x-modules:
+      - path: projects/proxy.yaml
+        options:
+          backend_host_template: '{{"/{domain}/sys/legacy"}}'
       - spec:
           paths:
             /table: &sys_table
               x-modules:
                 - path: sys/table.js
                   options:
                     conf: '{{options.table}}'
-            /key_value: &sys_key_value
+            /legacy/key_value: &sys_key_value
               x-modules:
                 - path: sys/key_value.js
-            /page_revisions:
+            /legacy/page_revisions:
               x-modules:
                 - path: sys/page_revisions.js
             /post_data: