From a5b7aca9b79c9d353b1627cb446fae88cf02fd70 Mon Sep 17 00:00:00 2001 From: Simon C Date: Thu, 17 Oct 2024 14:13:47 +0200 Subject: [PATCH] =?UTF-8?q?feat(LLDAP):=20Utilisation=20de=20la=20nouvelle?= =?UTF-8?q?=20variable=20plus=20g=C3=A9n=C3=A9ric?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lldap/.env | 2 +- lldap/docker-compose.traefik.yml | 4 ++-- lldap/docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldap/.env b/lldap/.env index d254f6c..512f22f 100644 --- a/lldap/.env +++ b/lldap/.env @@ -8,7 +8,7 @@ COMPOSE_FILE=${SERVICES_DIR}/lldap/docker-compose.yml:${SERVICES_DIR}/lldap/dock ####### # LLDAP -LLDAP_DOMAIN=lldap.cool.life +SERVICE_DOMAIN=lldap.cool.life LLDAP_VOLUME_NAME=lldap_cool_life LLDAP_CONTAINER_NAME=lldap_cool_life LLDAP_IMAGE=nitnelave/lldap:v0.4.3 diff --git a/lldap/docker-compose.traefik.yml b/lldap/docker-compose.traefik.yml index 35cb3a6..e062d02 100644 --- a/lldap/docker-compose.traefik.yml +++ b/lldap/docker-compose.traefik.yml @@ -10,13 +10,13 @@ services: labels: - traefik.enable=true - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik} - - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=Host(`${LLDAP_DOMAIN:?err}`) + - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=Host(`${SERVICE_DOMAIN:?err}`) - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web} # - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.tls.certResolver=letsencrypt - traefik.http.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.port=17170 - traefik.http.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.scheme=http # https://github.com/lldap/lldap/issues/247#issuecomment-1489962511 - # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=HostSNI(`${LLDAP_DOMAIN:?err}`) + # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=HostSNI(`${SERVICE_DOMAIN:?err}`) # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web} # - traefik.tcp.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.port=3890 diff --git a/lldap/docker-compose.yml b/lldap/docker-compose.yml index 97c4194..798c37c 100644 --- a/lldap/docker-compose.yml +++ b/lldap/docker-compose.yml @@ -16,7 +16,7 @@ services: - LLDAP_VERBOSE=${LLDAP_VERBOSE:-false} - LLDAP_JWT_SECRET=${LLDAP_JWT_SECRET:?err} - - LLDAP_HTTP_URL=https://${LLDAP_DOMAIN:?err} + - LLDAP_HTTP_URL=https://${SERVICE_DOMAIN:?err} - LLDAP_LDAP_BASE_DN=${LLDAP_LDAP_BASE_DN:?err} - LLDAP_LDAP_USER_DN=${LLDAP_LDAP_USER_DN:?err}