From b7c6703acdf5b40d8d4fe77c93d18cc58885ab39 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 11 Jun 2026 12:26:27 +0200 Subject: [PATCH] remove mcda up from test Signed-off-by: Basil Bruhn --- conf.d/mcda-up.psi.ch.conf | 29 ------------------ docker-compose.yaml | 61 -------------------------------------- 2 files changed, 90 deletions(-) delete mode 100644 conf.d/mcda-up.psi.ch.conf diff --git a/conf.d/mcda-up.psi.ch.conf b/conf.d/mcda-up.psi.ch.conf deleted file mode 100644 index 8adbdd3..0000000 --- a/conf.d/mcda-up.psi.ch.conf +++ /dev/null @@ -1,29 +0,0 @@ -server { - listen 80; - server_name mcda-up-test.psi.ch; - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name mcda-up-test.psi.ch; - - ssl_certificate /etc/nginx/certs/mcda-up-test.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/mcda-up-test.psi.ch.key; - - location /api/ { - proxy_pass http://up-mavt-suite-backend:5000/api/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - location / { - proxy_pass http://up-mavt-suite-frontend:3000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } -} diff --git a/docker-compose.yaml b/docker-compose.yaml index 7371b69..8815d4c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -480,66 +480,6 @@ services: - tomcatwiki_backend - backend - # Simone Pagliuca / River Huang - # UP-MAVT-Suite - up-mavt-suite-mongo: - image: mongo:7.0 - container_name: up-mavt-suite-mongo - environment: - MONGO_INITDB_DATABASE: elicitation - volumes: - - /opt/webcontent/up-mavt-suite/mongo-data:/data/db - networks: - - up_mavt_suite_network - restart: always - - up-mavt-suite-backend: - image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.5 - container_name: up-mavt-suite-backend - environment: - MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - FLASK_ENV: production - ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} - OAUTH2_CLIENT_SECRET: ${MCDA_UP_OAUTH2_SECRET} - SMTP_HOST: smtp.office365.com - SMTP_PORT: 587 - SMTP_USER: mcda@psi.ch - EMAIL_AUTH_MODE: oauth2 - OAUTH2_TENANT_ID: 50f89ee2-f910-47c5-9913-a6ea08928f11 - OAUTH2_CLIENT_ID: 201ba262-3c76-41fb-8942-dcefb7729caa - OAUTH2_SCOPE: https://outlook.office365.com/.default - OAUTH2_USERNAME: mcda@psi.ch - SMTP_USE_TLS: true - EMAIL_FROM: mcda@psi.ch - APP_BASE_URL: https://mcda-up-test.psi.ch/ - depends_on: - - up-mavt-suite-mongo - networks: - - up_mavt_suite_network - - backend - restart: always - - up-mavt-suite-worker: - image: gitea.psi.ch/images/up-mavt-suite-worker:0.9.5 - container_name: up-mavt-suite-worker - environment: - MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - depends_on: - - up-mavt-suite-mongo - networks: - - up_mavt_suite_network - restart: always - - up-mavt-suite-frontend: - image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.5 - container_name: up-mavt-suite-frontend - depends_on: - - up-mavt-suite-backend - networks: - - up_mavt_suite_network - - backend - restart: always - networks: public: backend: @@ -547,5 +487,4 @@ networks: it_strategy_dashboard_backend: panda_maintenance_backend: tomcatwiki_backend: - up_mavt_suite_network: