Merge pull request 'deploy tiermaker to DMZ' (#33) from tiermaker into main

Reviewed-on: linux/WebHosting_DMZ#33

conf.d/tiermaker.conf

@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name tier-ranking.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name tier-ranking.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_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;
+    }
+}

docker-compose.yaml

@@ -83,7 +83,7 @@ services:
       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}
+      OAUTH2_CLIENT_SECRET: ${MCDA_OAUTH2_SECRET}
       SMTP_HOST: smtp.office365.com
       SMTP_PORT: 587
       SMTP_USER: mcda@psi.ch
@@ -144,6 +144,64 @@ services:
     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_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:
+      - /mount/webhosting_dmz_write/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
+
   # Lange Clemens <clemens.lange@psi.ch>
   # summer-project-selection.psi.ch
   summer-project-selection: