chore!: remove wdqs-proxy

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

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

.github/workflows/_build_test.yml

@@ -28,7 +28,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@*'
       - 'wikibase-lts@*'
 

.github/workflows/create_release.yml

@@ -15,7 +15,6 @@ on:
           - quickstatements
           - wdqs
           - wdqs-frontend
-          - wdqs-proxy
           - wikibase
           - wikibase-lts
           - All projects with unreleased changes

README.md

@@ -121,9 +121,7 @@ In order to test your own instances of the services, make sure to change the fol
 WIKIBASE_URL=http://wikibase
 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
+WDQS_URL=http://query
 MW_ADMIN_NAME=
 MW_ADMIN_PASS=
 MW_SCRIPT_PATH=/w

build/wdqs-frontend/README.md

@@ -41,14 +41,13 @@ If QuickStatements and Wikibase are running on the same IP address, a reverse pr
 
 ### Environment variables
 
-| Variable        | Default                      | Description                              |
-| --------------- | ---------------------------- | ---------------------------------------- |
-| `LANGUAGE`      | "en"                         | Language to use in the UI                |
-| `BRAND_TITLE`   | "DockerWikibaseQueryService" | Name to display on the UI                |
-| `WIKIBASE_HOST` | "wikibase"                   | Hostname of the Wikibase host (required) |
-| `WDQS_HOST`     | "wdqs"                       | Hostname of the WDQS host                |
-| `WDQS_PORT`     | "9999"                       | Port of the WDQS host                    |
-| `COPYRIGHT_URL` | "undefined"                  | URL for the copyright notice             |
+Variables in **bold** are required.
+
+| Variable                  | Default                      | Description                    |
+| ------------------------- | ---------------------------- | -------------------------------|
+| `LANGUAGE`                | "en"                         | Language to use in the UI      |
+| **`WDQS_PUBLIC_URL`**     |                              | Hostname of the WDQS host      |
+| **`WIKIBASE_PUBLIC_URL`** |                              | Hostname of the Wikibase host  |
 
 ## Example
 
@@ -125,6 +124,7 @@ services:
         hard: 32768
     volumes:
       - wdqs-data:/wdqs/data
+    # TODO: make it available
     healthcheck:
       test: curl --silent --fail localhost:9999/bigdata/namespace/wdq/sparql
       interval: 10s
@@ -144,8 +144,6 @@ services:
 
   wdqs-frontend:
     image: wikibase/wdqs-frontend
-    depends_on:
-      - wdqs-proxy
     restart: unless-stopped
     ports:
       - 8834:80
@@ -155,7 +153,8 @@ services:
       - "traefik.http.routers.wdqs-frontend.entrypoints=websecure"
       - "traefik.http.routers.wdqs-frontend.tls.certresolver=letsencrypt"
     environment:
-      WDQS_HOST: wdqs-proxy
+      WDQS_PUBLIC_URL: https://query.example/sparql
+      WIKIBASE_PUBLIC_URL: https://wikibase.example/w/api.php
     healthcheck:
       test: curl --silent --fail localhost
       interval: 10s

build/wdqs-frontend/custom-config.json

@@ -1,10 +1,10 @@
 {
 	"api": {
 		"sparql": {
-			"uri": "/proxy/wdqs/bigdata/namespace/wdq/sparql"
+			"uri": "$WDQS_PUBLIC_URL"
 		},
 		"wikibase": {
-			"uri": "/proxy/wikibase/w/api.php"
+			"uri": "$WIKIBASE_PUBLIC_URL"
 		},
 		"examples": {
 			"server": "https://www.wikidata.org/",

build/wdqs-frontend/default.conf

@@ -3,16 +3,6 @@ server {
     listen       80;
     server_name  localhost;
 
-    location /proxy/wikibase {
-        rewrite /proxy/wikibase/(.*) /${DOLLAR}1 break;
-        proxy_pass http://$WIKIBASE_HOST:80;
-    }
-
-    location /proxy/wdqs {
-        rewrite /proxy/wdqs/(.*) /${DOLLAR}1 break;
-        proxy_pass http://$WDQS_HOST:80;
-    }
-
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
@@ -23,3 +13,40 @@ server {
         root   /usr/share/nginx/html;
     }
 }
+
+
+
+
+# server {
+#     listen 80 default_server;
+#     listen [::]:80 default_server;
+#
+#     location ~ ^/bigdata/(namespace/[a-zA-Z0-9_]+/sparql|ldf|assets) {
+#         # use IP address for the backend and not "localhost" to ensure
+#         # connection is done over IPv4 (backend is configured as IPv4 only)
+#         proxy_pass http://${PROXY_PASS_HOST};
+#
+#         proxy_set_header X-BIGDATA-MAX-QUERY-MILLIS ${PROXY_MAX_QUERY_MILLIS};
+#         proxy_set_header X-BIGDATA-READ-ONLY "yes";
+#
+#         add_header Access-Control-Allow-Origin * always;
+#         #add_header Cache-Control "public, max-age=300";
+#         add_header Vary Accept;
+#
+#         client_max_body_size 1m;
+#         client_body_buffer_size 1m;
+#         proxy_intercept_errors off;
+#         proxy_buffering on;
+#         proxy_buffer_size 16k;
+#         proxy_buffers 256 16k;
+#         proxy_busy_buffers_size 256k;
+#         proxy_temp_file_write_size 16k;
+#         proxy_max_temp_file_size 10m;
+#         proxy_read_timeout 300;
+#
+#         limit_except GET OPTIONS POST {
+#             deny all;
+#         }
+#
+#     }
+# }

build/wdqs-frontend/entrypoint.sh

@@ -3,13 +3,13 @@
 
 # Test if required environment variables have been set
 if [ -z "$WIKIBASE_HOST" ]; then
-echo "WIKIBASE_HOST is required but isn't set. You should pass it to docker. See: https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file";
-exit 1;
+	echo "WIKIBASE_HOST is required but isn't set. You should pass it to docker. See: https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file";
+	exit 1;
 fi
 
 if [ -z "$WDQS_HOST" ]; then
-echo "WDQS_HOST is required but isn't set. You should pass it to docker. See: https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file";
-exit 1;
+	echo "WDQS_HOST is required but isn't set. You should pass it to docker. See: https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file";
+	exit 1;
 fi
 
 set -eu