This commit is contained in:
Michael Grote 2024-03-03 19:43:13 +01:00 committed by mg
parent dda0d457e1
commit 09a3cc1f2a
3 changed files with 7 additions and 50 deletions

View File

@ -2,7 +2,7 @@ version: "3"
services:
######## App ########
lldap:
image: nitnelave/lldap:stable
image: nitnelave/lldap:v0.5.0
container_name: lldap-app
restart: always
ports:
@ -37,9 +37,7 @@ services:
LLDAP_SMTP_OPTIONS__PORT: 25
LLDAP_SMTP_OPTIONS__SMTP_ENCRYPTION: NONE
LLDAP_SMTP_OPTIONS__USER: info@mgrote.net
labels:
- com.centurylinklabs.watchtower.enable=true
- com.centurylinklabs.watchtower.depends-on=lldap-db
######## DB ########
lldap-db:
image: mariadb:10.6.14
@ -57,8 +55,6 @@ services:
- MYSQL_INITDB_SKIP_TZINFO=1
networks:
- intern
labels:
- com.centurylinklabs.watchtower.enable=true
######## Volumes ########
volumes:
@ -71,3 +67,6 @@ networks:
external: true
mail-relay:
external: true
# ToDo
# Secrets

View File

@ -1,40 +0,0 @@
version: '3'
services:
wiki-webserver:
container_name: wiki-webserver
image: httpd:2.4@sha256:ba846154ade27292d216cce2d21f1c7e589f3b66a4a643bff0cdd348efd17aa3
restart: always
networks:
- traefik
ports:
- 8087:80
volumes:
- /docker/wiki/site:/usr/local/apache2/htdocs/
# /docker/wiki/site ist ein lokales Verzeichnis auf docker10
# dieser Verzeichnis wird direkt in der wiki ci gemountet
# und die daten werden dort reingeschrieben
labels:
traefik.http.routers.wiki.rule: Host(`wiki2.mgrote.net`)
traefik.enable: true
traefik.http.routers.wiki.tls: true
traefik.http.routers.wiki.tls.certresolver: resolver_letsencrypt
traefik.http.routers.wiki.entrypoints: entry_https
traefik.http.services.wiki.loadbalancer.server.port: 80
traefik.http.routers.wiki.middlewares: nforwardauth
# traefik.http.routers.wiki.middlewares: ldap_auth
#
# # ldapAuth Options
# traefik.http.middlewares.ldap_auth.plugin.ldapAuth.enabled: true
# traefik.http.middlewares.ldap_auth.plugin.ldapAuth.logLevel: DEBUG
# traefik.http.middlewares.ldap_auth.plugin.ldapAuth.url: ldap://lldap-app
# traefik.http.middlewares.ldap_auth.plugin.ldapAuth.port: 3890
# traefik.http.middlewares.ldap_auth.plugin.ldapAuth.baseDN: "ou=people,dc=grote,dc=lan"
# traefik.http.middlewares.ldap_auth.plugin.ldapAuth.attribute: uid
com.centurylinklabs.watchtower.enable: true
######## Networks ########
networks:
traefik:
external: true

View File

@ -59,8 +59,6 @@ compose_files:
- name: navidrome
state: present
network: traefik
- name: watchtower
state: absent
- name: routeros-config-export
state: present
- name: mail-relay
@ -72,8 +70,8 @@ compose_files:
- name: wiki
state: present
network: traefik
- name: statping-ng
state: absent
- name: lldap
state: present
### oefenweb.ufw
ufw_rules: