From 515e7cad7443649767ca7f20c7cdcd0010f1d792 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 15 Nov 2024 19:00:41 +0000 Subject: [PATCH] changed Files: docker-compose/lldap/docker-compose.yml.j2 group_vars/munin.yml Signed-off-by: Michael Grote --- docker-compose/lldap/docker-compose.yml.j2 | 12 +----------- group_vars/munin.yml | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/docker-compose/lldap/docker-compose.yml.j2 b/docker-compose/lldap/docker-compose.yml.j2 index 523462d1..8db1a1da 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 # auskommentieren wenn fertig + - "17170:17170" # front-end volumes: - "lldap_data:/data" - "./lldap_config.toml:/data/lldap_config.toml" @@ -18,16 +18,6 @@ services: - internal depends_on: - lldap-db17 - 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 - traefik.http.routers.lldap.middlewares: allowlist_localnet@file ######## Postgres ######## lldap-db17: diff --git a/group_vars/munin.yml b/group_vars/munin.yml index af1ac78b..c4cfe98f 100644 --- a/group_vars/munin.yml +++ b/group_vars/munin.yml @@ -101,7 +101,7 @@ munin_node_plugins: src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/http/http_response config: | [http_response] - env.sites https://git.mgrote.net https://docker10.mgrote.net:8443 https://rui.mgrote.net/ http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net https://s3.mgrote.net https://auth.mgrote.net https://ldap.mgrote.net + env.sites https://git.mgrote.net https://docker10.mgrote.net:8443 https://rui.mgrote.net/ http://munin.mgrote.net http://192.168.5.1 http://192.168.3.1 http://192.168.3.108:8080 http://192.168.3.204 http://docker10.mgrote.net:6483 https://miniflux.mgrote.net/ https://nextcloud.mgrote.net https://audio.mgrote.net/mg http://wiki.mgrote.net https://s3.mgrote.net https://auth.mgrote.net http://docker10.mgrote.net:17170 env.max_time 20 env.short_label true env.follow_redirect true