From 3e7bc935accee4dd68578c00df4485bb2141f44e Mon Sep 17 00:00:00 2001 From: ritter_t Date: Wed, 8 Oct 2025 15:24:27 +0200 Subject: [PATCH 1/4] it_strategy_dashboard v2.0.1 (#12) New defautlt data added via liquibase in backend container Co-authored-by: ritter_t Co-authored-by: tom.ritter Reviewed-on: https://gitea.psi.ch/linux/WebHosting/pulls/12 Reviewed-by: buchel_k Co-authored-by: ritter_t Co-committed-by: ritter_t --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f894c18..d9d1813 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -202,7 +202,7 @@ services: - it_strategy_dashboard_backend it-strategy-dashboard-backend: - image: gitea.psi.ch/9501/it-strategy-dashboard-backend:2.0 + image: gitea.psi.ch/9501/it-strategy-dashboard-backend:2.0.1 container_name: it-strategy-dashboard-backend restart: always environment: From 2bd2cbade7f41f845f506d5e7cfb0b1abec23716 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Thu, 16 Oct 2025 18:42:29 +0200 Subject: [PATCH 2/4] Rename service name from `carculator` to `swiss-ecargo` because this is a special version of `carculator` and we want to reserve the `carculator` name for later. --- conf.d/{carculator.conf => swiss-ecargo.conf} | 6 +++--- docker-compose.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename conf.d/{carculator.conf => swiss-ecargo.conf} (70%) diff --git a/conf.d/carculator.conf b/conf.d/swiss-ecargo.conf similarity index 70% rename from conf.d/carculator.conf rename to conf.d/swiss-ecargo.conf index 767515e..0f7f127 100644 --- a/conf.d/carculator.conf +++ b/conf.d/swiss-ecargo.conf @@ -1,16 +1,16 @@ server { listen 80; - server_name carculator-api-test.psi.ch; + server_name swiss-ecargo-api-test.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; - server_name carculator-api-test.psi.ch; + server_name swiss-ecargo-api-test.psi.ch; location / { - proxy_pass http://carculator:8000; + proxy_pass http://swiss-ecargo: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; diff --git a/docker-compose.yaml b/docker-compose.yaml index 6388cf0..cd61395 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -60,9 +60,9 @@ services: # Romain Sacchi # Software host and access to the Internet - carculator: - image: gitea.psi.ch/sacchi_r/carculator:0.1.0 - container_name: carculator + swiss-ecargo: + image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.0 + container_name: swiss-ecargo restart: always networks: - backend From 57edf05d52cb85580f7e17fefcebc4c74c9a11de Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Tue, 21 Oct 2025 13:42:45 +0200 Subject: [PATCH 3/4] letsencrypt Signed-off-by: Basil Bruhn --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index d9d1813..4abc565 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,6 +11,8 @@ services: - "80:80" - "443:443" volumes: + - /etc/letsencrypt/live:/etc/letsencrypt/live:ro + - /etc/letsencrypt/archive:/etc/letsencrypt/archive:ro - /etc/pki/tls/certs:/etc/nginx/certs:ro - /etc/pki/tls/private:/etc/nginx/private:ro - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro From d78cc05037d479ddb97059fe853f440d9107b944 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Tue, 21 Oct 2025 17:00:20 +0200 Subject: [PATCH 4/4] certificate name Signed-off-by: Basil Bruhn --- conf.d/swiss-ecargo.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/swiss-ecargo.conf b/conf.d/swiss-ecargo.conf index 28830cd..00e3ef9 100644 --- a/conf.d/swiss-ecargo.conf +++ b/conf.d/swiss-ecargo.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name swiss-ecargo-api-test.psi.ch; - ssl_certificate /etc/nginx/certs/carculator-api-test.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/carculator-api-test.psi.ch.key; + ssl_certificate /etc/nginx/certs/swiss-ecargo-api-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/swiss-ecargo-api-test.psi.ch.key; location / { proxy_pass http://swiss-ecargo:8000;