substitute TLD for PORTAL_HOST

MaRDI4NFDI · Sep 4, 2023 · db005a2 · db005a2
1 parent 40f4742
commit db005a2
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,12 +12,11 @@ x-common-variables: &wikibase_variables
   DB_USER: ${DB_USER:-sqluser}
   DB_PASS: ${DB_PASS}
   DB_NAME: ${DB_NAME:-my_wiki}
-  TLD: ${TLD:-de}
   DEPLOYMENT_ENV: ${DEPLOYMENT_ENV:-local}
   WIKIBASE_SCHEME: ${WIKIBASE_SCHEME:-https}
   WIKIBASE_HOST: ${WIKIBASE_HOST:-localhost}
   PORTAL_HOST: ${PORTAL_HOST}
-  QS_PUBLIC_SCHEME_HOST_AND_PORT: https://quickstatements.portal.mardi4nfdi.${TLD}
+  QS_PUBLIC_SCHEME_HOST_AND_PORT: https://quickstatements.${PORTAL_HOST}
   TRAEFIK_PW: ${TRAEFIK_PW}
 x-extra-variables: &wikibase_extra_variables
   MW_ELASTIC_HOST: ${MW_ELASTIC_HOST:-elasticsearch.svc}
@@ -56,12 +55,12 @@ services:
       MATOMO_TOKEN: ${MATOMO_TOKEN}
       GOOGLE_OPENID_SECRET: ${GOOGLE_OPENID_SECRET}
     labels:
-      - traefik.http.routers.service-wikibase.rule=Host(`portal.mardi4nfdi.${TLD}`,`swmath.portal.mardi4nfdi.${TLD}`,`staging.swmath.org`)
+      - traefik.http.routers.service-wikibase.rule=Host(`${PORTAL_HOST}`,`swmath.${PORTAL_HOST}`,`staging.swmath.org`)
       - traefik.http.routers.service-wikibase.entrypoints=websecure
       - traefik.http.routers.service-wikibase.tls.certResolver=le
       - traefik.http.routers.service-wikibase.service=wikibase-service
       - traefik.http.services.wikibase-service.loadbalancer.server.port=80
-      - traefik.http.routers.service-wikimongo.rule=Host(`wikimongo.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.service-wikimongo.rule=Host(`wikimongo.${PORTAL_HOST}`)
       - traefik.http.routers.service-wikimongo.entrypoints=websecure
       - traefik.http.routers.service-wikimongo.tls.certResolver=le
       - traefik.http.routers.service-wikimongo.service=wikimongo-service
@@ -192,7 +191,7 @@ services:
     networks:
       - default
     labels:
-      - traefik.http.routers.dashboard.rule=Host(`traefik.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.dashboard.rule=Host(`traefik.${PORTAL_HOST}`)
       - traefik.http.routers.dashboard.entrypoints=websecure
       - traefik.http.routers.dashboard.tls.certResolver=le
       - traefik.http.routers.dashboard.service=api@internal
@@ -243,14 +242,14 @@ services:
     networks:
       default:
         aliases:
-         - query.portal.mardi4nfdi.${TLD}
+         - query.${PORTAL_HOST}
          - wdqs-frontend.svc
     environment:
-      - WIKIBASE_HOST=portal.mardi4nfdi.${TLD}
+      - WIKIBASE_HOST=${PORTAL_HOST}
       - WDQS_HOST=wdqs-proxy.svc
       - BRAND_TITLE=MaRDIQueryService
     labels:
-      - traefik.http.routers.service-wdqs-frontend.rule=Host(`query.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.service-wdqs-frontend.rule=Host(`query.${PORTAL_HOST}`)
       - traefik.http.routers.service-wdqs-frontend.entrypoints=websecure
       - traefik.http.routers.service-wdqs-frontend.tls.certResolver=le
 
@@ -265,7 +264,7 @@ services:
         aliases:
          - wdqs.svc
     environment:
-      - WIKIBASE_HOST=portal.mardi4nfdi.${TLD}
+      - WIKIBASE_HOST=${PORTAL_HOST}
       - WIKIBASE_SCHEME=${WIKIBASE_SCHEME:-https}
       - WDQS_HOST=wdqs.svc
       - WDQS_PORT=9999
@@ -284,7 +283,7 @@ services:
         aliases:
          - wdqs-proxy.svc
     labels:
-      - traefik.http.routers.wdqs-proxy.rule=Host(`sparql.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.wdqs-proxy.rule=Host(`sparql.${PORTAL_HOST}`)
       - traefik.http.routers.wdqs-proxy.entrypoints=websecure
       - traefik.http.routers.wdqs-proxy.tls.certResolver=le
 
@@ -300,7 +299,7 @@ services:
         aliases:
          - wdqs-updater.svc
     environment:
-     - WIKIBASE_HOST=portal.mardi4nfdi.${TLD}
+     - WIKIBASE_HOST=${PORTAL_HOST}
      - WIKIBASE_SCHEME=${WIKIBASE_SCHEME:-https}
      - WDQS_HOST=wdqs.svc
      - WDQS_PORT=9999
@@ -318,16 +317,16 @@ services:
     networks:
       default:
         aliases:
-         - quickstatements.portal.mardi4nfdi.${TLD}
+         - quickstatements.${PORTAL_HOST}
     labels:
-      - traefik.http.routers.service-quickstatements.rule=Host(`quickstatements.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.service-quickstatements.rule=Host(`quickstatements.${PORTAL_HOST}`)
       - traefik.http.routers.service-quickstatements.entrypoints=websecure
       - traefik.http.routers.service-quickstatements.tls.certResolver=le
     environment:
-      - QUICKSTATEMENTS_HOST=https://quickstatements.portal.mardi4nfdi.${TLD}
+      - QUICKSTATEMENTS_HOST=https://quickstatements.${PORTAL_HOST}
       - WIKIBASE_SCHEME_AND_HOST=http://wikibase-docker.svc
-      - QS_PUBLIC_SCHEME_HOST_AND_PORT=https://quickstatements.portal.mardi4nfdi.${TLD}
-      - WB_PUBLIC_SCHEME_HOST_AND_PORT=https://portal.mardi4nfdi.${TLD}
+      - QS_PUBLIC_SCHEME_HOST_AND_PORT=https://quickstatements.${PORTAL_HOST}
+      - WB_PUBLIC_SCHEME_HOST_AND_PORT=https://${PORTAL_HOST}
       - WB_PROPERTY_NAMESPACE=122
       - "WB_PROPERTY_PREFIX=Property:"
       - WB_ITEM_NAMESPACE=120
@@ -344,7 +343,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock # needs access to docker process
       - portainer-data:/data # volume to save settings of portainer
     labels:
-      - traefik.http.routers.service-portainer.rule=Host(`portainer.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.service-portainer.rule=Host(`portainer.${PORTAL_HOST}`)
       - traefik.http.routers.service-portainer.entrypoints=websecure
       - traefik.http.routers.service-portainer.tls.certResolver=le
       - traefik.http.services.portainer-docker.loadbalancer.server.port=9000
@@ -380,7 +379,7 @@ services:
       - --web.console.libraries=/usr/share/prometheus/console_libraries
       - --web.console.templates=/usr/share/prometheus/consoles
     labels:
-      - traefik.http.routers.prometheus.rule=Host(`prometheus.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.prometheus.rule=Host(`prometheus.${PORTAL_HOST}`)
       - traefik.http.routers.prometheus.entrypoints=websecure
       - traefik.http.routers.prometheus.tls.certResolver=le
       - traefik.http.routers.prometheus.middlewares=auth
@@ -406,7 +405,7 @@ services:
       - grafana_data:/var/lib/grafana
       - ./grafana/:/etc/grafana/
     labels:
-      - traefik.http.routers.grafana.rule=Host(`grafana.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.grafana.rule=Host(`grafana.${PORTAL_HOST}`)
       - traefik.http.routers.grafana.entrypoints=websecure
       - traefik.http.routers.grafana.tls.certResolver=le
 
@@ -433,7 +432,7 @@ services:
     environment:
       COLLECTOR_ZIPKIN_HTTP_PORT: 9411
     labels:
-      - traefik.http.routers.jaeger.rule=Host(`jaeger.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.jaeger.rule=Host(`jaeger.${PORTAL_HOST}`)
       - traefik.http.routers.jaeger.entrypoints=websecure
       - traefik.http.routers.jaeger.tls.certResolver=le
       - traefik.http.routers.jaeger.middlewares=auth
@@ -472,14 +471,14 @@ services:
     volumes:
       - goaccess_report:/usr/share/nginx/html
     labels:
-      - traefik.http.routers.nginx.rule=Host(`stats.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.nginx.rule=Host(`stats.${PORTAL_HOST}`)
       - traefik.http.routers.nginx.entrypoints=websecure
       - traefik.http.routers.nginx.tls.certResolver=le
       - traefik.http.routers.nginx.middlewares=auth
   scholia:
     image: ghcr.io/mardi4nfdi/scholia:nightly
     labels:
-      - traefik.http.routers.scholia.rule=Host(`scholia.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.scholia.rule=Host(`scholia.${PORTAL_HOST}`)
       - traefik.http.routers.scholia.entrypoints=websecure
       - traefik.http.routers.scholia.tls.certResolver=le
 
@@ -496,7 +495,7 @@ services:
       - MATOMO_DATABASE_PASSWORD=${MATOMO_DATABASE_PASSWORD}
       - MATOMO_DATABASE_DBNAME=${MATOMO_DATABASE_DBNAME}
     labels:
-      - traefik.http.routers.matomo.rule=Host(`matomo.portal.mardi4nfdi.${TLD}`)
+      - traefik.http.routers.matomo.rule=Host(`matomo.${PORTAL_HOST}`)
       - traefik.http.routers.matomo.entrypoints=websecure
       - traefik.http.routers.matomo.tls.certResolver=le