bump TRAEFIK_YML_VERSION

.env.sample

@@ -44,12 +44,6 @@ COMPOSE_FILE="compose.yml"
 #GANDI_ENABLED=1
 #SECRET_GANDIV5_API_KEY_VERSION=v1
 
-## Cloudflare, https://cloudflare.com
-#COMPOSE_FILE="$COMPOSE_FILE:compose.cloudflare.yml"
-#CLOUDFLARE_ENABLED=1
-#SECRET_CLOUDFLARE_EMAIL_VERSION=v1
-#SECRET_CLOUDFLARE_API_KEY=v1
-
 #####################################################################
 # Keycloak log-in                                                   #
 #####################################################################
@@ -108,3 +102,7 @@ COMPOSE_FILE="compose.yml"
 ## Matrix
 #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
 #MATRIX_FEDERATION_ENABLED=1
+
+## Minecraft
+#COMPOSE_FILE="$COMPOSE_FILE:compose.minecraft.yml"
+#MINECRAFT_ENABLED=1

abra.sh

@@ -1,3 +1,3 @@
-export TRAEFIK_YML_VERSION=v14
+export TRAEFIK_YML_VERSION=v16
 export FILE_PROVIDER_YML_VERSION=v6
 export ENTRYPOINT_VERSION=v2

compose.cloudflare.yml

@@ -1,20 +0,0 @@
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - CLOUDFLARE_EMAIL_FILE=/run/secrets/cloudflare_email
-      - CLOUDFLARE_API_KEY_FILE=/run/secrets/cloudflare_api_key
-      - LETS_ENCRYPT_DNS_CHALLENGE_ENABLED
-      - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER
-    secrets:
-      - cloudflare_email
-      - cloudflare_api_key
-
-secrets:
-  cloudflare_email:
-    name: ${STACK_NAME}_cloudflare_email_${SECRET_CLOUDFLARE_EMAIL_VERSION}
-    external: true
-  cloudflare_api_key:
-    name: ${STACK_NAME}_cloudflare_api_key_${SECRET_CLOUDFLARE_API_KEY}
-    external: true

compose.minecraft.yml

@@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - MINECRAFT_ENABLED
+    ports:
+      - 25565:25565

compose.yml

@@ -26,8 +26,6 @@ services:
     environment:
       - DASHBOARD_ENABLED
       - LOG_LEVEL
-      - LETS_ENCRYPT_EMAIL
-      - LETS_ENCRYPT_ENV
     healthcheck:
       test: ["CMD", "traefik", "healthcheck"]
       interval: 30s

entrypoint.sh.tmpl

@@ -11,9 +11,4 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
 export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE")
 {{ end }}
 
-{{ if eq (env "CLOUDFLARE_ENABLED") "1" }}
-export CLOUDFLARE_EMAIL=$(cat "$CLOUDFLARE_EMAIL_FILE")
-export CLOUDFLARE_API_KEY=$(cat "$CLOUDFLARE_API_KEY_FILE")
-{{ end }}
-
 /entrypoint.sh "$@"

traefik.yml.tmpl

@@ -54,9 +54,9 @@ entrypoints:
   mumble-udp:
     address: ":64738/udp"
   {{ end }}
-  {{ if eq (env "COMPY_ENABLED") "1" }}
-  compy:
-    address: ":9999"
+  {{ if eq (env "MINECRAFT_ENABLED") "1" }}
+  minecraft:
+    address: ":25565"
   {{ end }}
   {{ if eq (env "METRICS_ENABLED") "1" }}
   metrics:
@@ -77,36 +77,30 @@ metrics:
 {{ end }}
 
 certificatesResolvers:
-  {{ if eq (env "LETS_ENCRYPT_ENV") "staging" }}
   staging:
     acme:
       email: {{ env "LETS_ENCRYPT_EMAIL" }}
       storage: /etc/letsencrypt/staging-acme.json
       caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
+      httpChallenge:
+        entryPoint: web
       {{ if eq (env "LETS_ENCRYPT_DNS_CHALLENGE_ENABLED") "1" }}
       dnsChallenge:
         provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
         resolvers:
           - "1.1.1.1:53"
           - "8.8.8.8:53"
-      {{ else }}
-      httpChallenge:
-        entryPoint: web
       {{ end }}
-  {{ end }}
-  {{ if eq (env "LETS_ENCRYPT_ENV") "production" }}
   production:
     acme:
       email: {{ env "LETS_ENCRYPT_EMAIL" }}
       storage: /etc/letsencrypt/production-acme.json
+      httpChallenge:
+        entryPoint: web
       {{ if eq (env "LETS_ENCRYPT_DNS_CHALLENGE_ENABLED") "1" }}
       dnsChallenge:
         provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
         resolvers:
           - "1.1.1.1:53"
           - "8.8.8.8:53"
-      {{ else }}
-      httpChallenge:
-        entryPoint: web
       {{ end }}
-  {{ end }}