From 0d905552a6ae85b7053f9d0c0c8e562d5f70fee8 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Mon, 19 Jan 2026 08:01:56 +0100 Subject: [PATCH] deploy summer project selection from test to prod Signed-off-by: Basil Bruhn --- conf.d/summer-project-selection.conf | 24 ++++++++++++++++++++++++ docker-compose.yaml | 22 ++++++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 conf.d/summer-project-selection.conf diff --git a/conf.d/summer-project-selection.conf b/conf.d/summer-project-selection.conf new file mode 100644 index 0000000..76c0b15 --- /dev/null +++ b/conf.d/summer-project-selection.conf @@ -0,0 +1,24 @@ +server { + listen 80; + server_name summer-project-selection.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name summer-project-selection.psi.ch; + + + ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key; + + location / { + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_pass http://summer-project-selection:5000; + 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 2a7cd31..46050bc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ services: -# linux-eng@psi.ch + # linux-eng@psi.ch nginx: - image: gitea.psi.ch/images/nginx:1.29.1 + image: gitea.psi.ch/images/nginx:1.29.4 container_name: nginx_proxy restart: always ports: @@ -21,7 +21,7 @@ services: - public - backend - # rfwtools + # rfwtools # gfa-status-test apache: image: gitea.psi.ch/images/php-apache:latest @@ -35,7 +35,7 @@ services: networks: - backend -# Huang He + # Huang He mcda-calculator: image: gitea.psi.ch/images/mcda-calculator:1.0.3 container_name: mcda-calculator @@ -53,6 +53,20 @@ services: networks: - backend + + # Lange Clemens + # summer-project-selection.psi.ch + summer-project-selection: + image: gitea.psi.ch/lange_c/summer-project-selection:latest + container_name: summer-project-selection + restart: always + volumes: + - /opt/webcontent/DMZ/summer-project-selection/data:/app/data + - /opt/webcontent/DMZ/summer-project-selection/projects:/app/projects + - /opt/webcontent/DMZ/summer-project-selection/applicants:/app/applicants + networks: + - backend + networks: public: backend: