Merge pull request 'deploy summer project selection from test to prod' (#7) from summer_student_selection into main

Reviewed-on: linux/WebHosting_DMZ#7
This commit is contained in:
2026-01-19 08:02:20 +01:00
2 changed files with 42 additions and 4 deletions
+24
View File
@@ -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;
}
}
+18 -4
View File
@@ -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 <river.huang@psi.ch>
# Huang He <river.huang@psi.ch>
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 <clemens.lange@psi.ch>
# 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: