chore: update wdqs frontend host in template to match common setups

build/wdqs-frontend/README.md

@@ -151,7 +151,7 @@ services:
       - 8834:80
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.wdqs-frontend.rule=Host(`query.example`)"
+      - "traefik.http.routers.wdqs-frontend.rule=Host(`query.wikibase.example`)"
       - "traefik.http.routers.wdqs-frontend.entrypoints=websecure"
       - "traefik.http.routers.wdqs-frontend.tls.certresolver=letsencrypt"
     environment:

deploy-lts/README.md

@@ -45,7 +45,7 @@ WBS Deploy consists of the following services:
 You need three DNS records that resolve to your machine's IP address, one for each user-facing service:
 
 - Wikibase, e.g., "wikibase.example"
-- QueryService, e.g., "query.example"
+- QueryService, e.g., "query.wikibase.example"
 - QuickStatements, e.g., "quickstatements.example"
 
 ### Initial setup
@@ -304,10 +304,10 @@ Removing the `traefik-letsencrypt-data` volume will request a new certificate fr
 
 ## WDQS Frontend
 
-To interact with the WDQS frontend, navigate to the URL defined as `WDQS_FRONTEND_PUBLIC_HOST` in the `.env` file. By default, this is set to `wdqs-frontend.example`.
+To interact with the WDQS frontend, navigate to the URL defined as `WDQS_FRONTEND_PUBLIC_HOST` in the `.env` file. By default, this is set to `query.wikibase.example`.
 
 Alternatively, send `GET` requests with your SPARQL query to the WDQS frontend endpoint:
-`https://wdqs-frontend.example.com/proxy/wdqs/bigdata/namespace/wdq/sparql?query={SPARQL}`
+`https://query.wikibase.example/proxy/wdqs/bigdata/namespace/wdq/sparql?query={SPARQL}`
 
 
 ## FAQ

deploy-lts/template.env

@@ -14,7 +14,7 @@
 # deployed to. Note that you need three distinct names, e.g. three different
 # subdomains. Otherwise the reverse proxy cannot route properly.
 WIKIBASE_PUBLIC_HOST=wikibase.example
-WDQS_FRONTEND_PUBLIC_HOST=wdqs-frontend.example
+WDQS_FRONTEND_PUBLIC_HOST=query.wikibase.example
 QUICKSTATEMENTS_PUBLIC_HOST=quickstatements.example
 
 # MediaWiki / Wikibase user configuration.

deploy/README.md

@@ -45,7 +45,7 @@ WBS Deploy consists of the following services:
 You need three DNS records that resolve to your machine's IP address, one for each user-facing service:
 
 - Wikibase, e.g., "wikibase.example"
-- QueryService, e.g., "query.example"
+- QueryService, e.g., "query.wikibase.example"
 - QuickStatements, e.g., "quickstatements.example"
 
 ### Initial setup
@@ -304,10 +304,10 @@ Removing the `traefik-letsencrypt-data` volume will request a new certificate fr
 
 ## WDQS Frontend
 
-To interact with the WDQS frontend, navigate to the URL defined as `WDQS_FRONTEND_PUBLIC_HOST` in the `.env` file. By default, this is set to `wdqs-frontend.example`.
+To interact with the WDQS frontend, navigate to the URL defined as `WDQS_FRONTEND_PUBLIC_HOST` in the `.env` file. By default, this is set to `query.wikibase.example`.
 
 Alternatively, send `GET` requests with your SPARQL query to the WDQS frontend endpoint:
-`https://wdqs-frontend.example.com/proxy/wdqs/bigdata/namespace/wdq/sparql?query={SPARQL}`
+`https://query.wikibase.example/proxy/wdqs/bigdata/namespace/wdq/sparql?query={SPARQL}`
 
 
 ## FAQ

deploy/template.env

@@ -14,7 +14,7 @@
 # deployed to. Note that you need three distinct names, e.g. three different
 # subdomains. Otherwise the reverse proxy cannot route properly.
 WIKIBASE_PUBLIC_HOST=wikibase.example
-WDQS_FRONTEND_PUBLIC_HOST=wdqs-frontend.example
+WDQS_FRONTEND_PUBLIC_HOST=query.wikibase.example
 QUICKSTATEMENTS_PUBLIC_HOST=quickstatements.example
 
 # MediaWiki / Wikibase user configuration.

test/suites/docker-compose.override.yml

@@ -68,9 +68,9 @@ services:
     networks:
       default:
         aliases:
-          - wikibase.example
-          - wdqs-frontend.example
-          - quickstatements.example
+          - ${WIKIBASE_PUBLIC_HOST}
+          - ${WDQS_FRONTEND_PUBLIC_HOST}
+          - ${QUICKSTATEMENTS_PUBLIC_HOST}
 
 volumes:
   wikibase-config:

test/test-services.env

@@ -1,7 +1,7 @@
 # Any of these can be overridden locally in ../local.env
 
 WIKIBASE_PUBLIC_HOST=wikibase.example
-WDQS_FRONTEND_PUBLIC_HOST=wdqs-frontend.example
+WDQS_FRONTEND_PUBLIC_HOST=query.wikibase.example
 QUICKSTATEMENTS_PUBLIC_HOST=quickstatements.example
 
 MW_ADMIN_NAME=admin
@@ -11,7 +11,7 @@ MW_ADMIN_PASS=change-this-password
 # URLs used by tests to access services from within the
 # docker network through traefik proxy
 WIKIBASE_URL=http://wikibase.example
-WDQS_FRONTEND_URL=http://wdqs-frontend.example
+WDQS_FRONTEND_URL=http://query.wikibase.example
 QUICKSTATEMENTS_URL=http://quickstatements.example
 
 # URLs used by tests to access services from within the docker network directly