feat (deploy): Replace wdqs-proxy with Traefik configuration

.github/actions/pull-ghcr/action.yml

@@ -14,7 +14,6 @@ runs:
           "elasticsearch"
           "wdqs"
           "wdqs-frontend"
-          "wdqs-proxy"
           "quickstatements"
         )
 

.github/workflows/_build_test.yml

@@ -27,7 +27,6 @@ jobs:
           - elasticsearch
           - wdqs
           - wdqs-frontend
-          - wdqs-proxy
           - quickstatements
 
     steps:

.github/workflows/build_publish_image_release.yml

@@ -7,7 +7,6 @@ on:
       - 'quickstatements@*'
       - 'wdqs@*'
       - 'wdqs-frontend@*'
-      - 'wdqs-proxy@*'
       - 'wikibase@*'     
 
 permissions:

.github/workflows/create_release.yml

@@ -14,7 +14,6 @@ on:
           - quickstatements
           - wdqs
           - wdqs-frontend
-          - wdqs-proxy
           - wikibase
           - All projects (images and deploy) with unreleased changes
       dry_run:

README.md

@@ -117,7 +117,6 @@ WIKIBASE_CLIENT_URL=http://wikibase-client
 QUICKSTATEMENTS_URL=http://quickstatements
 WDQS_FRONTEND_URL=http://wdqs-frontend
 WDQS_URL=http://wdqs:9999
-WDQS_PROXY_URL=http://wdqs-proxy
 MW_ADMIN_NAME=
 MW_ADMIN_PASS=
 MW_SCRIPT_PATH=/w

build/wdqs-frontend/README.md

@@ -137,7 +137,7 @@ services:
   wdqs-frontend:
     image: wikibase/wdqs-frontend
     depends_on:
-      - wdqs-proxy
+      - wdqs
     restart: unless-stopped
     ports:
       - 8834:80
@@ -146,8 +146,6 @@ services:
       - "traefik.http.routers.wdqs-frontend.rule=Host(`query.example`)"
       - "traefik.http.routers.wdqs-frontend.entrypoints=websecure"
       - "traefik.http.routers.wdqs-frontend.tls.certresolver=letsencrypt"
-    environment:
-      WDQS_HOST: wdqs-proxy
     healthcheck:
       test: curl --silent --fail localhost
       interval: 10s

build/wdqs/README.md

@@ -29,9 +29,7 @@ You'll need one instance of the image to execute the updater started using `/run
 
 ### WDQS Proxy for public facing setups
 
-By default, WDQS exposes some endpoints and methods that reveal internal details or functionality that might allow for abuse of the system. Wikibase Suite offers the [WDQS-proxy](../WDQS-proxy/README.md) which filters out all long-running or unwanted requests.
-
-When running WDQS in a setup without WDQS-proxy, **please consider disabling these endpoints in some other way**.
+By default, WDQS exposes some endpoints and methods that reveal internal details or functionality that might allow for abuse of the system. Wikibase Suite Deploy includes a Traefik-based proxy setup which filters out all long-running or unwanted requests. When running WDQS in a setup without a proxy, **please consider disabling these endpoints in some other way**.
 
 ### Environment variables
 
@@ -141,13 +139,6 @@ services:
         soft: 32768
         hard: 32768
 
-  wdqs-proxy:
-    image: wikibase/wdqs-proxy
-    depends_on:
-      wdqs:
-        condition: service_healthy
-    restart: unless-stopped
-
 volumes:
   wikibase-image-data:
   mysql-data:

deploy/README.md

@@ -16,7 +16,6 @@ WBS Deploy consists of the following services:
 - **[Elasticsearch](https://hub.docker.com/r/wikibase/elasticsearch)** Search service used by MediaWiki.
 - **[WDQS](https://hub.docker.com/r/wikibase/wdqs)** Wikidata Query Service to process SPARQL queries.
 - **[WDQS Frontend](https://hub.docker.com/r/wikibase/wdqs-frontend)** Web front end for SPARQL queries.
-- **[WDQS Proxy](https://hub.docker.com/r/wikibase/wdqs-proxy)** A middle layer for WDQS which serves to filter requests and make the service more secure.
 - **[WDQS Updater](https://www.mediawiki.org/wiki/Wikidata_Query_Service/User_Manual#runUpdate.sh)** Keeps the WDQS data in sync with Wikibase.
 - **[Quickstatements](https://hub.docker.com/r/wikibase/quickstatements)** A web-based tool to import and manipulate large amounts of data.
 - **[Traefik](https://hub.docker.com/_/traefik)** A reverse proxy that handles TLS termination and SSL certificate renewal through ACME.