wip: no qs subdomain

wmde · Feb 14, 2025 · 14cc302 · 14cc302
1 parent 4863935
commit 14cc302
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -15,7 +15,8 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.wikibase.rule=Host(`${WIKIBASE_PUBLIC_HOST}`)"
+      - "traefik.http.routers.wikibase-router.rule=Host(`${WIKIBASE_PUBLIC_HOST}`)"
+      - "traefik.http.routers.wikibase-router.rule=!PathPrefix(`/tools`)"
     volumes:
       - ./config:/config
       - wikibase-image-data:/var/www/html/images
@@ -83,7 +84,7 @@ services:
       start_period: 2m
 
   wdqs:
-    image: wikibase/wdqs:2
+    image: wikibase/wdqs
     command: /runBlazegraph.sh
     depends_on:
       wikibase:
@@ -152,7 +153,7 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.wdqs-frontend.rule=Host(`${WDQS_PUBLIC_HOST}`) && !PathPrefix(`/sparql`)"
+      - "traefik.http.routers.wdqs-frontend-router.rule=Host(`${WDQS_PUBLIC_HOST}`) && !PathPrefix(`/sparql`)"
     environment:
       WDQS_PUBLIC_URL: https://${WDQS_PUBLIC_HOST}/sparql
       WIKIBASE_PUBLIC_URL: https://${WIKIBASE_PUBLIC_HOST}/w/api.php
@@ -171,9 +172,14 @@ services:
       - quickstatements-data:/quickstatements/data
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.quickstatements.rule=Host(`${QUICKSTATEMENTS_PUBLIC_HOST}`)"
+      - "traefik.http.routers.quickstatements-router.rule=Host(`${WIKIBASE_PUBLIC_HOST}`) && PathPrefix(`/tools/quickstatements`)"
+      - "traefik.http.middlewares.quickstatements-redirectregex.redirectregex.regex=/tools/quickstatements$"
+      - "traefik.http.middlewares.quickstatements-redirectregex.redirectregex.replacement=/tools/quickstatements/"
+      - "traefik.http.middlewares.quickstatements-redirectregex.redirectregex.permanent=true"
+      - "traefik.http.middlewares.quickstatements-stripprefix.stripprefix.prefixes=/tools/quickstatements"
+      - "traefik.http.routers.quickstatements-router.middlewares=quickstatements-redirectregex,quickstatements-stripprefix"
     environment:
-      QUICKSTATEMENTS_PUBLIC_URL: https://${QUICKSTATEMENTS_PUBLIC_HOST}
+      QUICKSTATEMENTS_PUBLIC_URL: https://${WIKIBASE_PUBLIC_HOST}/tools/quickstatements
       WIKIBASE_PUBLIC_URL: https://${WIKIBASE_PUBLIC_HOST}
     healthcheck:
       test: curl --silent --fail localhost
@@ -184,6 +190,7 @@ services:
   # C. REVERSE PROXY AND SSL SERVICES
   # --------------------------------------------------
 
+  # This is the reverse proxy and SSL service
   traefik:
     image: traefik:3.1
     command:

diff --git a/deploy/template.env b/deploy/template.env
@@ -11,11 +11,10 @@
 # Public hostname configuration.
 # These domain names for your Wikibase Suite services should be configured on
 # your DNS server to point to the public IP address of the server being
-# deployed to. Note that you need three distinct names, e.g. three different
-# subdomains. Otherwise the reverse proxy cannot route properly.
+# deployed to. Note that you need two distinct names, e.g. two different
+# subdomains. Otherwise the traefik reverse proxy cannot route properly.
 WIKIBASE_PUBLIC_HOST=wikibase.example
 WDQS_PUBLIC_HOST=query.wikibase.example
-QUICKSTATEMENTS_PUBLIC_HOST=quickstatements.example
 
 # MediaWiki / Wikibase user configuration.
 # Password must be at least 10 characters, different from your username and not