From 5b1f757062ac38b26bd23dc25ed7f902dc9909b9 Mon Sep 17 00:00:00 2001 From: huang_h Date: Wed, 4 Mar 2026 17:26:20 +0100 Subject: [PATCH 1/2] mcda-srf config --- docker-compose.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index e16a454..2cfdcf7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -108,6 +108,14 @@ services: networks: - backend + # MCDA SRF tool + mcda-srf: + image: gitea.psi.ch/images/mcda-srf:0.1.0 + container_name: mcda-srf + restart: always + networks: + - backend + # Romain Sacchi swiss-ecargo: From 6044b1cb2718ea12239e28e714c0fd7156ac31e0 Mon Sep 17 00:00:00 2001 From: cx7388 Date: Wed, 4 Mar 2026 19:49:57 +0100 Subject: [PATCH 2/2] MCDA SRF and PCT config --- conf.d/mcda-pct.conf | 21 +++++++++++++++++++++ conf.d/mcda-srf.conf | 21 +++++++++++++++++++++ docker-compose.yaml | 7 +++++++ 3 files changed, 49 insertions(+) create mode 100644 conf.d/mcda-pct.conf create mode 100644 conf.d/mcda-srf.conf diff --git a/conf.d/mcda-pct.conf b/conf.d/mcda-pct.conf new file mode 100644 index 0000000..9f299c3 --- /dev/null +++ b/conf.d/mcda-pct.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name mcda-pct-test.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-pct-test.psi.ch; + + ssl_certificate /etc/nginx/certs/mcda-pct-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/mcda-pct-test.psi.ch.key; + + location / { + proxy_pass http://mcda-pct:8080; + 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; + } +} \ No newline at end of file diff --git a/conf.d/mcda-srf.conf b/conf.d/mcda-srf.conf new file mode 100644 index 0000000..94dd546 --- /dev/null +++ b/conf.d/mcda-srf.conf @@ -0,0 +1,21 @@ +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; + } +} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 2cfdcf7..099a5fb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -116,6 +116,13 @@ services: networks: - backend + # MCDA SRF tool + mcda-pct: + image: gitea.psi.ch/images/mcda-pct:0.2.0 + container_name: mcda-pct + restart: always + networks: + - backend # Romain Sacchi swiss-ecargo: