From 31085299536cfe99ee94fa15eea81ce5ccf54f8e Mon Sep 17 00:00:00 2001
From: Christian Galo <christian.galo@outlook.com>
Date: Fri, 14 Jul 2023 21:26:07 +0000
Subject: [PATCH] =?UTF-8?q?Removing=20abra=20bloatware=20=F0=9F=98=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.headless.yml   | 14 --------------
 compose.host.yml       | 15 ---------------
 compose.smtp.yml       |  9 ---------
 compose.yaml           | 13 ++++---------
 entrypoint.sh.tmpl     | 14 --------------
 file-provider.yml.tmpl | 16 ++++++++--------
 6 files changed, 12 insertions(+), 69 deletions(-)
 delete mode 100644 compose.headless.yml
 delete mode 100644 compose.host.yml
 delete mode 100644 compose.smtp.yml
 delete mode 100644 entrypoint.sh.tmpl

diff --git a/compose.headless.yml b/compose.headless.yml
deleted file mode 100644
index 0ccb9bc..0000000
--- a/compose.headless.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    deploy:
-      update_config:
-        failure_action: rollback
-        order: start-first
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.traefik.loadbalancer.server.port=web"
-        - "traefik.http.routers.traefik.entrypoints=web-secure"
-        - "traefik.http.routers.traefik.service=api@internal"
diff --git a/compose.host.yml b/compose.host.yml
deleted file mode 100644
index b4fef30..0000000
--- a/compose.host.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    deploy:
-      update_config:
-        order: stop-first
-    ports:
-      - target: 80
-        published: 80
-        mode: host
-      - target: 443
-        published: 443
-        mode: host
diff --git a/compose.smtp.yml b/compose.smtp.yml
deleted file mode 100644
index 16d503c..0000000
--- a/compose.smtp.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - SMTP_ENABLED
-    ports:
-      - "587:587"
diff --git a/compose.yaml b/compose.yaml
index eb1aeda..b1c2e39 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,8 +2,12 @@ services:
   app:
     image: "traefik:v2.10.1"
     ports:
+      # HTTP
       - "80:80"
+      # HTTPS
       - "443:443"
+      # SMTP
+      - "587:587"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "letsencrypt:/etc/letsencrypt"
@@ -12,9 +16,6 @@ services:
         target: /etc/traefik/traefik.yml
       - source: file_provider_yml
         target: /etc/traefik/file-provider.yml
-      - source: entrypoint
-        target: /custom-entrypoint.sh
-        mode: 0555
     networks:
       - proxy
     environment:
@@ -27,7 +28,6 @@ services:
       retries: 10
       start_period: 1m
     command: traefik
-    entrypoint: /custom-entrypoint.sh
     deploy:
       update_config:
         failure_action: rollback
@@ -41,7 +41,6 @@ services:
         - "traefik.http.routers.traefik.tls.options=default@file"
         - "traefik.http.routers.traefik.service=api@internal"
         - "traefik.http.routers.traefik.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.version=1.1.1+v2.8.1"
 
 networks:
   proxy:
@@ -56,10 +55,6 @@ configs:
     name: ${STACK_NAME}_file_provider_yml_${FILE_PROVIDER_YML_VERSION}
     file: file-provider.yml.tmpl
     template_driver: golang
-  entrypoint:
-    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
-    file: entrypoint.sh.tmpl
-    template_driver: golang
 
 volumes:
   letsencrypt:
\ No newline at end of file
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
deleted file mode 100644
index 298d5dc..0000000
--- a/entrypoint.sh.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-{{ if eq (env "OVH_ENABLED") "1" }}
-export OVH_CONSUMER_KEY=$(cat "$OVH_CONSUMER_KEY_FILE")
-export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
-{{ end }}
-
-{{ if eq (env "GANDI_ENABLED") "1" }}
-export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE")
-{{ end }}
-
-/entrypoint.sh "$@"
diff --git a/file-provider.yml.tmpl b/file-provider.yml.tmpl
index d12761e..67a5af3 100644
--- a/file-provider.yml.tmpl
+++ b/file-provider.yml.tmpl
@@ -9,14 +9,14 @@ http:
         authResponseHeaders:
           - X-Forwarded-User
     {{ end }}
-    {{ if eq (env "KEYCLOAK_MIDDLEWARE_2_ENABLED") "1" }}
-    keycloak2:
-      forwardAuth:
-        address: "http://{{ env "KEYCLOAK_TFA_SERVICE_2" }}:4181"
-        trustForwardHeader: true
-        authResponseHeaders:
-          - X-Forwarded-User
-    {{ end }}
+#    {{ if eq (env "KEYCLOAK_MIDDLEWARE_2_ENABLED") "1" }}
+#    keycloak2:
+#      forwardAuth:
+#        address: "http://{{ env "KEYCLOAK_TFA_SERVICE_2" }}:4181"
+#        trustForwardHeader: true
+#        authResponseHeaders:
+#          - X-Forwarded-User
+#    {{ end }}
     security:
       headers:
         frameDeny: true