Add ability for zipped artifacts to use https

distro/configs/traefik/config/tls.yml

@@ -6,4 +6,4 @@ tls:
         keyFile: /etc/ssl/traefik/privkey.pem
   certificates:
     - certFile: /etc/ssl/traefik/cert.pem
-      keyFile: /etc/ssl/traefik/privkey.pem
+      keyFile: /etc/ssl/traefik/privkey.pem

distro/configs/traefik/config/traefik.yml

@@ -18,27 +18,26 @@ entryPoints:
           scheme: https
   websecure:
     address: :443
+  web4000:
+    address: :4000
     http:
-      tls:
-        certResolver: le
-        domains:
-          - main: "traefik.me"
-            sans:
-              - "*.traefik.me"
+      redirections:
+        entryPoint:
+          to: web4000
+          scheme: https
 certificatesResolvers:
   le:
     acme:
       email: "info@mekomsolutions.com"
       storage: /letsencrypt/acme.json
       httpChallenge:
         entryPoint: web
+
 metrics:
   prometheus:
     entryPoint: "websecure"
 
 providers:
-  file:
-    filename: /etc/traefik/tls.yml
   docker:
     network: web
-    exposedByDefault: false
+    exposedByDefault: false

scripts/docker-compose-traefik.yml

@@ -4,36 +4,35 @@ networks:
 
 services:
   traefik:
-    image: traefik:v2.6
+    image: traefik:v3.5
     restart: always
     ports:
-      - "${TRAEFIK_PUBLIC_PORT:-80}:80"
+      - "80:80"
       - "443:443"
+      - "4000:4000"
     networks:
       - web
+    environment:
+      # - TRAEFIK_API_URL=${TRAEFIK_API_URL}
+      - TRAEFIK_ADMIN_USER=${TRAEFIK_ADMIN_USER}
+      - TRAEFIK_ADMIN_PASSWORD=${TRAEFIK_ADMIN_PASSWORD}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - '${TRAEFIK_CONFIG_PATH}/config/traefik.yml:/etc/traefik/traefik.yml'
-      - '${TRAEFIK_CONFIG_PATH}/config/tls.yml:/etc/traefik/tls.yml'
-      - '${TRAEFIK_CONFIG_PATH}/letsencrypt:/letsencrypt'
+      - './config/traefik.yml:/etc/traefik/traefik.yml'
+      - './config/tls.yml:/etc/traefik/tls.yml'
+      - ${LETS_ENCRYPT_CERT_PATH:-./letsencrypt}:/letsencrypt
       - certs:/etc/ssl/traefik
     labels:
       traefik.enable: "true"
-      traefik.http.routers.traefik.rule: "Host(`${TRAEFIK_HOSTNAME}`)"
+      traefik.http.routers.traefik.rule: "Host(`${TRAEFIK_LIME_DOMAIN_NAME}`) && PathPrefix(`/traefik`)"
       traefik.http.routers.traefik.entrypoints: "websecure"
       traefik.http.routers.traefik.service: "api@internal"
       traefik.http.routers.traefik.middlewares: "auth"
       traefik.http.middlewares.auth.basicauth.users: "${TRAEFIK_ADMIN_USER}:${TRAEFIK_ADMIN_PASSWORD}"
+      # Add TLS configuration for this specific router
+      traefik.http.routers.traefik.tls: "true"
+      traefik.http.routers.traefik.tls.certresolver: "le"
+      traefik.http.routers.traefik.tls.domains: "api.traefik.me"
 
-    depends_on:
-      reverse-proxy-https-helper:
-        condition: service_completed_successfully
-  reverse-proxy-https-helper:
-    image: alpine
-    command: sh -c "cd /etc/ssl/traefik
-      && wget traefik.me/fullchain.pem -O cert.pem
-      && wget traefik.me/privkey.pem -O privkey.pem"
-    volumes:
-      - certs:/etc/ssl/traefik
 volumes:
   certs:

scripts/secrets/azure.msf.env

@@ -228,6 +228,7 @@ MSF_DHIS2_PASSWORD=Admin123
 # Traefik Configuration
 # ==============================================================================
 
+TRAEFIK_LIME_DOMAIN_NAME=
 TRAEFIK_HOSTNAME=api-172-17-0-1.traefik.me
 TRAEFIK_ADMIN_USER=admin
 TRAEFIK_ADMIN_PASSWORD='{SHA}evLRC3OrfNj2A5N/dpfLX+Qyx/8='

scripts/secrets/local.msf.env

@@ -232,6 +232,7 @@ MSF_DHIS2_PASSWORD=Admin123
 # Traefik Configuration
 # ==============================================================================
 
+TRAEFIK_LIME_DOMAIN_NAME=
 TRAEFIK_HOSTNAME=api-172-17-0-1.traefik.me
 TRAEFIK_ADMIN_USER=admin
 TRAEFIK_ADMIN_PASSWORD='{SHA}evLRC3OrfNj2A5N/dpfLX+Qyx/8='