From a4eee184f5e21b78bec881c511c08c59b53dc02b Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Mon, 10 Aug 2026 13:48:54 +0200 Subject: [PATCH 1/8] add tiermaker Signed-off-by: Basil Bruhn --- conf.d/mcda-calculator copy.conf | 21 +++++++++++++++++++++ docker-compose.yaml | 7 +++++++ 2 files changed, 28 insertions(+) create mode 100644 conf.d/mcda-calculator copy.conf diff --git a/conf.d/mcda-calculator copy.conf b/conf.d/mcda-calculator copy.conf new file mode 100644 index 0000000..05bab8d --- /dev/null +++ b/conf.d/mcda-calculator copy.conf @@ -0,0 +1,21 @@ +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; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index dcb3a87..a1c9afc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -148,6 +148,13 @@ services: networks: - backend + drsa-tiermaker: + image: gitea.psi.ch/images/drsa-tiermaker:0.2 + container_name: drsa-tiermaker + restart: always + networks: + - backend + # PEPISCO # PhotoElectron PhotoIon Spectral COmpendium pepisco: From d9a56f671b093c550ede18baf612fa88f3ad925b Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Mon, 10 Aug 2026 13:51:58 +0200 Subject: [PATCH 2/8] file name Signed-off-by: Basil Bruhn --- conf.d/{mcda-calculator copy.conf => tiermaker.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf.d/{mcda-calculator copy.conf => tiermaker.conf} (100%) diff --git a/conf.d/mcda-calculator copy.conf b/conf.d/tiermaker.conf similarity index 100% rename from conf.d/mcda-calculator copy.conf rename to conf.d/tiermaker.conf From 20221d30db7c418cc7c07d4dee3e82477a60be3c Mon Sep 17 00:00:00 2001 From: fpotier Date: Tue, 11 Aug 2026 14:21:27 +0200 Subject: [PATCH 3/8] scicat-rocrate-dev: config --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ddceed4..0620889 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -481,14 +481,14 @@ services: - backend scicat-rocrate-dev: - image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.5.2 + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.6.0 container_name: scicat-rocrate-dev restart: always networks: - backend environment: - QUARKUS_REST_CLIENT_SCICAT_URL=https://scicat.development.psi.ch - - QUARKUS_REST_CLIENT_S3BROKER_URL=https://s3-broker.development.psi.ch + - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.development.psi.ch - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G volumes: - /opt/webcontent/rocrate-dev/dev:/ro-crate:rw From 5d22d4a40509e351c6ff3217d0f1013961bab2b3 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 13 Aug 2026 10:11:54 +0200 Subject: [PATCH 4/8] udpate tiermaker compose file Signed-off-by: Basil Bruhn --- docker-compose.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index a1c9afc..224d723 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -148,12 +148,51 @@ services: networks: - backend + # Enea Zeolla drsa-tiermaker: image: gitea.psi.ch/images/drsa-tiermaker:0.2 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} networks: - backend + - drsa_tiermaker_backend + # Enea Zeolla + 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 # PhotoElectron PhotoIon Spectral COmpendium From dd22a6614257617b21aff363f25a91b48a650ea1 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 13 Aug 2026 10:19:24 +0200 Subject: [PATCH 5/8] update version number Signed-off-by: Basil Bruhn --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 224d723..38a6dbf 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -150,7 +150,7 @@ services: # Enea Zeolla drsa-tiermaker: - image: gitea.psi.ch/images/drsa-tiermaker:0.2 + image: gitea.psi.ch/images/drsa-tiermaker:0.1.5 container_name: drsa-tiermaker restart: always depends_on: From e9995173950b74996e12f3489fb4f7a4fcd32394 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 13 Aug 2026 10:22:42 +0200 Subject: [PATCH 6/8] emergency network fix Signed-off-by: Basil Bruhn --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index a6cacb3..5f4c8a4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -588,3 +588,4 @@ networks: it_strategy_dashboard_backend: panda_maintenance_backend: tomcatwiki_backend: + drsa_tiermaker_backend: From 323139931c5ccf418edfa1ab80fa99798cfc309e Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 13 Aug 2026 10:53:06 +0200 Subject: [PATCH 7/8] move pct from docker to docker-dmz Signed-off-by: Basil Bruhn --- conf.d/mcda-pct.conf | 21 --------------------- docker-compose.yaml | 8 -------- 2 files changed, 29 deletions(-) delete mode 100644 conf.d/mcda-pct.conf diff --git a/conf.d/mcda-pct.conf b/conf.d/mcda-pct.conf deleted file mode 100644 index 9f299c3..0000000 --- a/conf.d/mcda-pct.conf +++ /dev/null @@ -1,21 +0,0 @@ -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/docker-compose.yaml b/docker-compose.yaml index 5f4c8a4..26bcbdc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -140,14 +140,6 @@ services: networks: - backend - # MCDA PCT tool - mcda-pct: - image: gitea.psi.ch/images/mcda-pct:0.2.0 - container_name: mcda-pct - restart: always - networks: - - backend - # Enea Zeolla drsa-tiermaker: image: gitea.psi.ch/images/drsa-tiermaker:0.1.5 From 94d11e34ce3134f9b47a34b427856e8783eb35a8 Mon Sep 17 00:00:00 2001 From: altorf_a Date: Wed, 19 Aug 2026 10:28:19 +0200 Subject: [PATCH 8/8] add pikettlischte-beautifier for pikett.psi.ch (#85) Co-authored-by: Aimo Altorfer Reviewed-on: https://gitea.psi.ch/linux/WebHosting/pulls/85 Co-authored-by: altorf_a --- conf.d/rf-pikett.conf | 21 +++++++++++++++++++++ docker-compose.yaml | 10 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 conf.d/rf-pikett.conf diff --git a/conf.d/rf-pikett.conf b/conf.d/rf-pikett.conf new file mode 100644 index 0000000..08ae66f --- /dev/null +++ b/conf.d/rf-pikett.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name rf-pikett.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name rf-pikett.psi.ch; + + ssl_certificate /etc/nginx/certs/rf-pikett.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/rf-pikett.psi.ch.key; + + location / { + proxy_pass http://pikettlischte-beautifier: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; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index 26bcbdc..b5623e8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -573,6 +573,16 @@ services: volumes: - /opt/webcontent/rocrate-dev/dev:/ro-crate:rw + # Aimo Altorfer / Roger Kalt - RF + # rf-pikett.psi.ch - Pikettlischte Beautifier + # Image is built from https://gitea.psi.ch/RF/pikettlischte-beautifier + pikettlischte-beautifier: + image: gitea.psi.ch/rf/pikettlischte-beautifier:latest + container_name: pikettlischte-beautifier + restart: always + networks: + - backend + networks: public: backend: