Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .package/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ services:
- traefik.tcp.routers.ldap.entrypoints=ldap
- traefik.tcp.routers.ldap.service=ldap
- traefik.tcp.services.ldap.loadbalancer.server.port=389
- traefik.tcp.services.ldap.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.ldap.loadbalancer.serversTransport=ldap_transport@file

- traefik.tcp.routers.ldaps.rule=HostSNI(`*`)
- traefik.tcp.routers.ldaps.entrypoints=ldaps
- traefik.tcp.routers.ldaps.service=ldaps
- traefik.tcp.routers.ldaps.tls=true
- traefik.tcp.routers.ldaps.tls.certResolver=md-resolver
- traefik.tcp.services.ldaps.loadbalancer.server.port=636
- traefik.tcp.services.ldaps.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.ldaps.loadbalancer.serversTransport=ldap_transport@file

cldap_server:
image: ghcr.io/multidirectorylab/multidirectory:${VERSION:-latest}
Expand Down Expand Up @@ -193,15 +193,15 @@ services:
- traefik.tcp.routers.global_ldap.entrypoints=global_ldap
- traefik.tcp.routers.global_ldap.service=global_ldap
- traefik.tcp.services.global_ldap.loadbalancer.server.port=3268
- traefik.tcp.services.global_ldap.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.global_ldap.loadbalancer.serversTransport=ldap_transport@file

- traefik.tcp.routers.global_ldap_tls.rule=HostSNI(`*`)
- traefik.tcp.routers.global_ldap_tls.entrypoints=global_ldap_tls
- traefik.tcp.routers.global_ldap_tls.service=global_ldap_tls
- traefik.tcp.routers.global_ldap_tls.tls=true
- traefik.tcp.routers.global_ldap_tls.tls.certresolver=md-resolver
- traefik.tcp.services.global_ldap_tls.loadbalancer.server.port=3269
- traefik.tcp.services.global_ldap_tls.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.global_ldap_tls.loadbalancer.serversTransport=ldap_transport@file

api_server:
image: ghcr.io/multidirectorylab/multidirectory:${VERSION:-latest}
Expand Down Expand Up @@ -230,7 +230,6 @@ services:
- "traefik.http.routers.api.service=api"
- "traefik.http.routers.api.middlewares=api_strip"
- "traefik.http.middlewares.api_strip.stripprefix.prefixes=/api"
- "traefik.http.middlewares.api_strip.stripprefix.forceslash=false"

command: python multidirectory.py --http
depends_on:
Expand Down
6 changes: 6 additions & 0 deletions .package/traefik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ api:
ping:
entryPoint: "ping"

tcp:
serversTransports:
ldap_transport:
proxyProtocol:
version: 2

entryPoints:
ping:
address: ":8800"
Expand Down
9 changes: 4 additions & 5 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,15 @@ services:
- traefik.tcp.routers.global_ldap.entrypoints=global_ldap
- traefik.tcp.routers.global_ldap.service=global_ldap
- traefik.tcp.services.global_ldap.loadbalancer.server.port=3268
- traefik.tcp.services.global_ldap.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.global_ldap.loadbalancer.serversTransport=ldap_transport@file

- traefik.tcp.routers.global_ldap_tls.rule=HostSNI(`*`)
- traefik.tcp.routers.global_ldap_tls.entrypoints=global_ldap_tls
- traefik.tcp.routers.global_ldap_tls.service=global_ldap_tls
- traefik.tcp.routers.global_ldap_tls.tls=true
- traefik.tcp.routers.global_ldap_tls.tls.certresolver=md-resolver
- traefik.tcp.services.global_ldap_tls.loadbalancer.server.port=3269
- traefik.tcp.services.global_ldap_tls.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.global_ldap_tls.loadbalancer.serversTransport=ldap_transport@file

cert_local_check:
image: multidirectory
Expand Down Expand Up @@ -237,15 +237,15 @@ services:
- traefik.tcp.routers.ldap.entrypoints=ldap
- traefik.tcp.routers.ldap.service=ldap
- traefik.tcp.services.ldap.loadbalancer.server.port=389
- traefik.tcp.services.ldap.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.ldap.loadbalancer.serversTransport=ldap_transport@file

- traefik.tcp.routers.ldaps.rule=HostSNI(`*`)
- traefik.tcp.routers.ldaps.entrypoints=ldaps
- traefik.tcp.routers.ldaps.service=ldaps
- traefik.tcp.routers.ldaps.tls=true
- traefik.tcp.routers.ldaps.tls.certresolver=md-resolver
- traefik.tcp.services.ldaps.loadbalancer.server.port=636
- traefik.tcp.services.ldaps.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.ldaps.loadbalancer.serversTransport=ldap_transport@file
healthcheck:
test: ["CMD-SHELL", "nc -zv 127.0.0.1 389 636"]
interval: 30s
Expand Down Expand Up @@ -279,7 +279,6 @@ services:
- "traefik.http.routers.api.service=api"
- "traefik.http.routers.api.middlewares=api_strip"
- "traefik.http.middlewares.api_strip.stripprefix.prefixes=/api"
- "traefik.http.middlewares.api_strip.stripprefix.forceslash=false"

command: python multidirectory.py --http
depends_on:
Expand Down
10 changes: 4 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ services:
- traefik.tcp.routers.ldap.entrypoints=ldap
- traefik.tcp.routers.ldap.service=ldap
- traefik.tcp.services.ldap.loadbalancer.server.port=389
- traefik.tcp.services.ldap.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.ldap.loadbalancer.serversTransport=ldap_transport@file

- traefik.tcp.routers.ldaps.rule=HostSNI(`*`)
- traefik.tcp.routers.ldaps.entrypoints=ldaps
- traefik.tcp.routers.ldaps.service=ldaps
- traefik.tcp.routers.ldaps.tls=true
- traefik.tcp.services.ldaps.loadbalancer.server.port=636
- traefik.tcp.services.ldaps.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.ldaps.loadbalancer.serversTransport=ldap_transport@file
healthcheck:
test: ["CMD-SHELL", "nc -zv 127.0.0.1 389 636"]
interval: 30s
Expand Down Expand Up @@ -160,15 +160,14 @@ services:
- traefik.tcp.routers.global_ldap.entrypoints=global_ldap
- traefik.tcp.routers.global_ldap.service=global_ldap
- traefik.tcp.services.global_ldap.loadbalancer.server.port=3268
- traefik.tcp.services.global_ldap.loadbalancer.proxyprotocol.version=2
- traefik.tcp.services.global_ldap.loadbalancer.serversTransport=ldap_transport@file

- traefik.tcp.routers.global_ldap_tls.rule=HostSNI(`*`)
- traefik.tcp.routers.global_ldap_tls.entrypoints=global_ldap_tls
- traefik.tcp.routers.global_ldap_tls.service=global_ldap_tls
- traefik.tcp.routers.global_ldap_tls.tls=true
- traefik.tcp.services.global_ldap_tls.loadbalancer.server.port=3269
- traefik.tcp.services.global_ldap_tls.loadbalancer.proxyprotocol.version=2

- traefik.tcp.services.global_ldap_tls.loadbalancer.serversTransport=ldap_transport@file
api:
image: multidirectory
container_name: multidirectory_api
Expand All @@ -191,7 +190,6 @@ services:
- "traefik.http.routers.api.service=api"
- "traefik.http.routers.api.middlewares=api_strip"
- "traefik.http.middlewares.api_strip.stripprefix.prefixes=/api"
- "traefik.http.middlewares.api_strip.stripprefix.forceslash=false"
depends_on:
migrations:
condition: service_completed_successfully
Expand Down
6 changes: 6 additions & 0 deletions traefik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ api:
ping:
entryPoint: "ping"

tcp:
serversTransports:
ldap_transport:
proxyProtocol:
version: 2

entryPoints:
ping:
address: ":8800"
Expand Down