From 67d5b01457a2712f292d3f0493b57df839bdb568 Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Thu, 14 Nov 2024 14:37:28 +0000
Subject: [PATCH] changed Files: docker-compose/lldap/docker-compose.yml.j2
 docker-compose/lldap/lldap_config.toml.j2

Signed-off-by: Michael Grote <michael.grote@posteo.de>
---
 docker-compose/lldap/docker-compose.yml.j2 | 27 +++++++++++++---------
 docker-compose/lldap/lldap_config.toml.j2  |  6 ++---
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/docker-compose/lldap/docker-compose.yml.j2 b/docker-compose/lldap/docker-compose.yml.j2
index 05187382..16e91262 100644
--- a/docker-compose/lldap/docker-compose.yml.j2
+++ b/docker-compose/lldap/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:
     pull_policy: missing
     ports:
       - "3890:3890"
-      # - "17170:17170" # front-end; ueber traefik
+      - "17170:17170" # front-end; ueber traefik # auskommentieren wenn fertig
     volumes:
       - "lldap_data:/data"
       - "./lldap_config.toml:/data/lldap_config.toml"
@@ -16,15 +16,15 @@ services:
       - traefik
       - postfix
       - internal
-    labels:
-      traefik.enable: true
-      traefik.http.routers.lldap.service: lldap
-      traefik.http.routers.lldap.priority: "10"
-      traefik.http.routers.lldap.rule: Host(`ldap.mgrote.net`)
-      traefik.http.routers.lldap.tls: true
-      traefik.http.routers.lldap.tls.certresolver: resolver_letsencrypt
-      traefik.http.routers.lldap.entrypoints: entry_https
-      traefik.http.services.lldap.loadbalancer.server.port: 17170
+    # labels:
+    #   traefik.enable: true
+    #   traefik.http.routers.lldap.service: lldap
+    #   traefik.http.routers.lldap.priority: "10"
+    #   traefik.http.routers.lldap.rule: Host(`ldap.mgrote.net`)
+    #   traefik.http.routers.lldap.tls: true
+    #   traefik.http.routers.lldap.tls.certresolver: resolver_letsencrypt
+    #   traefik.http.routers.lldap.entrypoints: entry_https
+    #   traefik.http.services.lldap.loadbalancer.server.port: 17170
     #healthcheck: # https://github.com/lldap/lldap/issues/18389
     #  test: ["CMD", "mc", "ready", "local"]
     #  interval: 5s
@@ -56,6 +56,7 @@ networks:
     external: true
   postfix:
     external: true
+  internal:
 
 ######## Volumes ########
 volumes:
@@ -63,4 +64,8 @@ volumes:
   db17:
 
 # todo heatclheck
-# rolle in friedhof
+# rolle in friedho
+# munin url
+# chedckliste
+# backups pve/pbs löschen
+# depends_on
diff --git a/docker-compose/lldap/lldap_config.toml.j2 b/docker-compose/lldap/lldap_config.toml.j2
index 36f3ee4a..39b2ef2c 100755
--- a/docker-compose/lldap/lldap_config.toml.j2
+++ b/docker-compose/lldap/lldap_config.toml.j2
@@ -20,7 +20,7 @@ key_seed = "{{ lookup('viczem.keepass.keepass', 'lldap/lldap_key_seed', 'passwor
 
 [smtp_options]
 enable_password_reset=false
-server=postfix
-port=25
+server = "postfix"
+port = 25
 smtp_encryption = "NONE"
-reply_to="Do not reply <info@mgrote.net>"
+reply_to  ="Do not reply <info@mgrote.net>"