From 2d576312e220eee2a843b7dfea3d6e19aee09985 Mon Sep 17 00:00:00 2001
From: romainsacchi <r_s@me.com>
Date: Mon, 27 Oct 2025 11:47:19 +0100
Subject: [PATCH 1/2] Added swiss-ecargo.conf Added entry in
 docker-compose.yaml

---
 conf.d/swiss-ecargo.conf | 21 +++++++++++++++++++++
 docker-compose.yaml      |  8 ++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 conf.d/swiss-ecargo.conf

diff --git a/conf.d/swiss-ecargo.conf b/conf.d/swiss-ecargo.conf
new file mode 100644
index 0000000..376f7cf
--- /dev/null
+++ b/conf.d/swiss-ecargo.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name swiss-ecargo-api.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name swiss-ecargo-api.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/swiss-ecargo-api.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/swiss-ecargo-api.psi.ch.key;
+
+    location / {
+        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;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0544d5d..fd6b1b0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,6 +28,14 @@ services:
     networks: 
       - backend
 
+  # Romain Sacchi <romain.sacchi@psi.ch>
+  swiss-ecargo:
+    image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.0
+    container_name: swiss-ecargo
+    restart: always
+    networks:
+      - backend
+
 networks:
   public:
   backend:

From a8fa4d78085f926dac3e32762e82376105e6df3c Mon Sep 17 00:00:00 2001
From: romainsacchi <r_s@me.com>
Date: Mon, 27 Oct 2025 11:50:13 +0100
Subject: [PATCH 2/2] Corrected SSL certificate and key paths

---
 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 376f7cf..fb82897 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.psi.ch;
 
-    ssl_certificate /etc/nginx/certs/swiss-ecargo-api.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/swiss-ecargo-api.psi.ch.key;
+    ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/certs/lx-docker-dmz-01.psi.ch.key;
 
     location / {
         proxy_pass http://swiss-ecargo:8000;