remove high energy physics apps from test since they are all in DMZ

Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
This commit is contained in:
bruhn_b committed 2026-08-24 18:33:24 +02:00
1 parent 000f35ae86
commit d79815c100
5 files changed
-168

No files matched your search

-21
View File
@@ -1,21 +0,0 @@
server {
listen 80;
server_name mcda-calculator-test.psi.ch;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl;
server_name mcda-calculator-test.psi.ch;
ssl_certificate /etc/nginx/certs/mcda-calculator-test.psi.ch.crt;
ssl_certificate_key /etc/nginx/private/mcda-calculator-test.psi.ch.key;
location / {
proxy_pass http://mcda-calculator:8050;
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;
}
}
-21
View File
@@ -1,21 +0,0 @@
server {
listen 80;
server_name mcda-dss-test.psi.ch;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl;
server_name mcda-dss-test.psi.ch;
ssl_certificate /etc/nginx/certs/mcda-dss-test.psi.ch.crt;
ssl_certificate_key /etc/nginx/private/mcda-dss-test.psi.ch.key;
location / {
proxy_pass http://mcda-dss:8050;
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;
}
}
-21
View File
@@ -1,21 +0,0 @@
server {
listen 80;
server_name mcda-srf-test.psi.ch;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl;
server_name mcda-srf-test.psi.ch;
ssl_certificate /etc/nginx/certs/mcda-srf-test.psi.ch.crt;
ssl_certificate_key /etc/nginx/private/mcda-srf-test.psi.ch.key;
location / {
proxy_pass http://mcda-srf:8000;
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;
}
}
-21
View File
@@ -1,21 +0,0 @@
server {
listen 80;
server_name tiermaker-test.psi.ch;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl;
server_name tiermaker-test.psi.ch;
ssl_certificate /etc/nginx/certs/tiermaker-test.psi.ch.crt;
ssl_certificate_key /etc/nginx/private/tiermaker-test.psi.ch.key;
location / {
proxy_pass http://drsa-tiermaker:80;
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;
}
}
-84
View File
@@ -113,90 +113,6 @@ services:
networks:
- backend
# Huang He <river.huang@psi.ch>
# Also installed on docker-dmz
# PSI Service
# MCDA DSS
mcda-dss:
image: gitea.psi.ch/images/mcda-dss:0.5.0
container_name: mcda-dss
restart: always
networks:
- backend
# MCDA Calculator
mcda-calculator:
image: gitea.psi.ch/images/mcda-calculator:1.0.3
container_name: mcda-calculator
restart: always
networks:
- backend
# MCDA SRF tool
mcda-srf:
image: gitea.psi.ch/images/mcda-srf:1.0.0
container_name: mcda-srf
restart: always
networks:
- backend
# Enea Zeolla <enea.zeolla@psi.ch>
drsa-tiermaker:
image: gitea.psi.ch/images/drsa-tiermaker:0.2.0
container_name: drsa-tiermaker
restart: always
depends_on:
drsa-tiermaker-db:
condition: service_healthy
environment:
- DATABASE_URL=postgresql+psycopg2://${DRSA_TIERMAKER_DB_USER}:${DRSA_TIERMAKER_DB_PW}@drsa-tiermaker-db:5432/drsa_tiermaker
- SECRET_KEY=${DRSA_TIERMAKER_SECRET_KEY}
- FIRST_ADMIN_EMAIL=mcda@psi.ch
- FIRST_ADMIN_PASSWORD=${DRSA_TIERMAKER_ADMIN_PW}
- ENVIRONMENT=production
- COOKIE_SECURE=true
- DRSA_ENGINE=builtin
- WEB_CONCURRENCY=2
- CORS_ORIGINS=${DRSA_TIERMAKER_URL}
- APP_BASE_URL=${DRSA_TIERMAKER_URL}
- 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
networks:
- backend
- drsa_tiermaker_backend
# Enea Zeolla <enea.zeolla@psi.ch>
drsa-tiermaker-db:
image: postgres:16-alpine
container_name: drsa-tiermaker-db
restart: always
environment:
- POSTGRES_USER=${DRSA_TIERMAKER_DB_USER}
- POSTGRES_PASSWORD=${DRSA_TIERMAKER_DB_PW}
- POSTGRES_DB=drsa_tiermaker
volumes:
- /opt/webcontent/drsa-tiermaker/db-data:/var/lib/postgresql/data
healthcheck:
test:
[
"CMD-SHELL",
"pg_isready -U ${DRSA_TIERMAKER_DB_USER} -d drsa_tiermaker",
]
interval: 10s
timeout: 5s
retries: 5
start_period: 30s
networks:
- drsa_tiermaker_backend
# PEPISCO <andras.boedi@psi.ch> <patrick.hemberger@psi.ch>
# PhotoElectron PhotoIon Spectral COmpendium
pepisco: