Merge pull request #172 from amosproj/feature/#118-preset-save-save-p…

…reset-button-and-text-box Fixed web config
amosproj · Jan 18, 2023 · 437e640 · 437e640
2 parents 51d4e34 + 25079ee
commit 437e640
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 13 deletions.
diff --git a/Apps/frontend/.env.develop b/Apps/frontend/.env.develop
@@ -1,3 +1,3 @@
-VITE_BACKEND_WEBSOCKET=wss://amos-sosci.die-degens.eu/dev/api
+VITE_BACKEND_WEBSOCKET=wss://amos-sosci.die-degens.eu/dev/backend/ws
 VITE_BASE_URL=https://amos-sosci.die-degens.eu/dev/ui
-VITE_BACKEND_BASE_URL=https://amos-sosci.die-degens.eu/dev/api
+VITE_BACKEND_BASE_URL=https://amos-sosci.die-degens.eu/dev/backend/rest
diff --git a/Apps/frontend/.env.integration b/Apps/frontend/.env.integration
@@ -1,3 +1,3 @@
-VITE_BACKEND_WEBSOCKET=wss://amos-sosci.die-degens.eu/int/api
+VITE_BACKEND_WEBSOCKET=wss://amos-sosci.die-degens.eu/int/backend/ws
 VITE_BASE_URL=https://amos-sosci.die-degens.eu/int/ui
-VITE_BACKEND_BASE_URL=https://amos-sosci.die-degens.eu/int/api
+VITE_BACKEND_BASE_URL=https://amos-sosci.die-degens.eu/int/backend/rest
diff --git a/Apps/frontend/.env.production b/Apps/frontend/.env.production
@@ -1,3 +1,3 @@
-VITE_BACKEND_WEBSOCKET=wss://amos-sosci.die-degens.eu/api
+VITE_BACKEND_WEBSOCKET=wss://amos-sosci.die-degens.eu/backend/ws
 VITE_BASE_URL=https://amos-sosci.die-degens.eu/ui
-VITE_BACKEND_BASE_URL=https://amos-sosci.die-degens.eu/api
+VITE_BACKEND_BASE_URL=https://amos-sosci.die-degens.eu/backend/rest
diff --git a/Deployments/web_deployment/dev/docker-compose.yml b/Deployments/web_deployment/dev/docker-compose.yml
@@ -65,14 +65,22 @@ services:
     labels:
       - "traefik.enable=true"
       # Remove path prefix
-      - "traefik.http.middlewares.sosci-backend-stripprefix-dev.stripprefix.prefixes=/dev/api"
+      - "traefik.http.middlewares.sosci-backend-stripprefix-dev.stripprefix.prefixes=/dev/backend/ws"
         # Main
-      - "traefik.http.routers.sosci-dev-backend.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/dev/api`)"
+      - "traefik.http.routers.sosci-dev-backend.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/dev/backend/ws`)"
       - "traefik.http.routers.sosci-dev-backend.entrypoints=websecure"
       - "traefik.http.routers.sosci-dev-backend.tls.certresolver=letsencrypt"
       - "traefik.http.routers.sosci-dev-backend.service=sosci-dev-backend"
       - "traefik.http.services.sosci-dev-backend.loadbalancer.server.port=9000"
       - "traefik.http.routers.sosci-dev-backend.middlewares=sosci-backend-stripprefix-dev"
+      # Main REST API
+      - "traefik.http.middlewares.sosci-backend-stripprefix-dev-rest.stripprefix.prefixes=/backend/rest"
+      - "traefik.http.routers.sosci-dev-backend-rest.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/backend/rest`)"
+      - "traefik.http.routers.sosci-dev-backend-rest.entrypoints=websecure"
+      - "traefik.http.routers.sosci-dev-backend-rest.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.sosci-dev-backend-rest.service=sosci-dev-backend"
+      - "traefik.http.services.sosci-dev-backend-rest.loadbalancer.server.port=8081"
+      - "traefik.http.routers.sosci-dev-backend-rest.middlewares=sosci-backend-stripprefix-dev-rest"
 
 networks:
   internal:

diff --git a/Deployments/web_deployment/int/docker-compose.yml b/Deployments/web_deployment/int/docker-compose.yml
@@ -64,14 +64,22 @@ services:
     labels:
       - "traefik.enable=true"
       # Remove path prefix
-      - "traefik.http.middlewares.sosci-backend-stripprefix-int.stripprefix.prefixes=/int/api"
+      - "traefik.http.middlewares.sosci-backend-stripprefix-int.stripprefix.prefixes=/int/backend/ws"
         # Main
-      - "traefik.http.routers.sosci-int-backend.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/int/api`)"
+      - "traefik.http.routers.sosci-int-backend.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/int/backend/ws`)"
       - "traefik.http.routers.sosci-int-backend.entrypoints=websecure"
       - "traefik.http.routers.sosci-int-backend.tls.certresolver=letsencrypt"
       - "traefik.http.routers.sosci-int-backend.service=sosci-int-backend"
       - "traefik.http.services.sosci-int-backend.loadbalancer.server.port=9000"
       - "traefik.http.routers.sosci-int-backend.middlewares=sosci-backend-stripprefix-int"
+      # Main REST API
+      - "traefik.http.middlewares.sosci-backend-stripprefix-int-rest.stripprefix.prefixes=/backend/rest"
+      - "traefik.http.routers.sosci-int-backend-rest.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/backend/rest`)"
+      - "traefik.http.routers.sosci-int-backend-rest.entrypoints=websecure"
+      - "traefik.http.routers.sosci-int-backend-rest.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.sosci-int-backend-rest.service=sosci-int-backend"
+      - "traefik.http.services.sosci-int-backend-rest.loadbalancer.server.port=8081"
+      - "traefik.http.routers.sosci-int-backend-rest.middlewares=sosci-backend-stripprefix-int-rest"
 
 networks:
   internal:

diff --git a/Deployments/web_deployment/prod/docker-compose.yml b/Deployments/web_deployment/prod/docker-compose.yml
@@ -64,14 +64,23 @@ services:
     labels:
       - "traefik.enable=true"
       # Remove path prefix
-      - "traefik.http.middlewares.sosci-backend-stripprefix-prod.stripprefix.prefixes=/api"
-        # Main
-      - "traefik.http.routers.sosci-prod-backend.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/api`)"
+      - "traefik.http.middlewares.sosci-backend-stripprefix-prod.stripprefix.prefixes=/backend/ws"
+      # Main WebSocket
+      - "traefik.http.routers.sosci-prod-backend.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/backend/ws`)"
       - "traefik.http.routers.sosci-prod-backend.entrypoints=websecure"
       - "traefik.http.routers.sosci-prod-backend.tls.certresolver=letsencrypt"
       - "traefik.http.routers.sosci-prod-backend.service=sosci-prod-backend"
       - "traefik.http.services.sosci-prod-backend.loadbalancer.server.port=9000"
       - "traefik.http.routers.sosci-prod-backend.middlewares=sosci-backend-stripprefix-prod"
+      # Main REST API
+      - "traefik.http.middlewares.sosci-backend-stripprefix-prod-rest.stripprefix.prefixes=/backend/rest"
+      - "traefik.http.routers.sosci-prod-backend-rest.rule=Host(`amos-sosci.die-degens.eu`) && PathPrefix(`/backend/rest`)"
+      - "traefik.http.routers.sosci-prod-backend-rest.entrypoints=websecure"
+      - "traefik.http.routers.sosci-prod-backend-rest.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.sosci-prod-backend-rest.service=sosci-prod-backend"
+      - "traefik.http.services.sosci-prod-backend-rest.loadbalancer.server.port=8081"
+      - "traefik.http.routers.sosci-prod-backend-rest.middlewares=sosci-backend-stripprefix-prod-rest"
+
 
 networks:
   internal: