Merge branch 'main' into add-access-log-config

.gitea/workflows/workflow.yaml

@@ -47,7 +47,7 @@ jobs:
     needs: [prepare_context]
     if: github.event_name == 'pull_request' && github.event.action != 'closed'
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
         uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
         uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -103,7 +103,7 @@ jobs:
     needs: [deploy_staging]
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
         uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3
@@ -165,7 +165,7 @@ jobs:
     needs: [deploy_preprod]
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Deploy via Rsync & Docker
         uses: easingthemes/ssh-deploy@2cc5b27bf3029d0455dd5e09fe02633904031447 # v6.0.3

docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   traefik:
-    image: "traefik:v3.7@sha256:1c32e7c368204fd72812152ebdd2ac0425993df6fd982317deb02e48f2d5423c"
+    image: "traefik:v3.7@sha256:5a52522fa05731d9c537540f873ba8c4842e83354c27275b747145bab75da120"
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
@@ -21,8 +21,7 @@ services:
       - "--certificatesResolvers.letsencrypt.acme.caServer=${CERTBOT_CA_RESOLVER}"
       - "${TRAEFIK_LEGACY_OPT:-}"
       - "--providers.file.watch=true"
-      - "--accesslog"
+      - "--accesslog=true"
-      - "--log.level=INFO"
     # extra_hosts:
     #   - "staging:${STAGING_IP:-192.168.1.85}"
     #   - "webserver:${LEGACY_IP:-192.168.1.85}"
@@ -36,7 +35,7 @@ services:
       - "./${ENV}:/etc/traefik"
 
   whoami:
-    image: "traefik/whoami@sha256:c4717a8d1f0134a7444e24f881160e033991f23027c6c5a9a3f8fd22e70d1d44"
+    image: "traefik/whoami@sha256:200689790a0a0ea48ca45992e0450bc26ccab5307375b41c84dfc4f2475937ab"
     restart: unless-stopped
     networks:
       - proxy

preprod/forward-to-legacy-nginx.yaml

@@ -13,16 +13,10 @@ tcp:
       entryPoints:
         - "https"
 
-  serversTransports:
-    nginx-legacy-transport-secure:
-      proxyProtocol:
-        version: 2
-
   services:
     # Service defining the external IP
     nginx-legacy-service-secure:
       loadBalancer:
-        serversTransport: nginx-legacy-transport-secure
         servers:
           # This is the actual external IP and Port of your Nginx
           - address: "webserver:443"

prod/forward-to-legacy-nginx.yaml

@@ -13,16 +13,10 @@ tcp:
       entryPoints:
         - "https"
 
-  serversTransports:
-    nginx-legacy-transport-secure:
-      proxyProtocol:
-        version: 2
-
   services:
     # Service defining the external IP
     nginx-legacy-service-secure:
       loadBalancer:
-        serversTransport: nginx-legacy-transport-secure
         servers:
           # This is the actual external IP and Port of your Nginx
           - address: "webserver:443"

tests/mock_nginx/legacy.conf

@@ -5,9 +5,6 @@ http {
         listen 80;
         server_name _;
 
-        real_ip_header X-Forwarded-For;
-        set_real_ip_from 0.0.0.0/0;
-
         location / {
             add_header X-Mock-Service "legacy";
             return 200 "Mock Nginx Legacy HTTP\n";
@@ -15,12 +12,9 @@ http {
     }
 
     server {
-        listen 443 ssl proxy_protocol;
+        listen 443 ssl;
         server_name _;
 
-        real_ip_header proxy_protocol;
-        set_real_ip_from 0.0.0.0/0;
-
         ssl_certificate /etc/nginx/certs/server.crt;
         ssl_certificate_key /etc/nginx/certs/server.key;