diff --git a/docker-compose.yml b/docker-compose.yml index 931a19b..3b21c02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ networks: ldap_net: internal: true frontend_net: - external: false + external: true services: @@ -43,7 +43,7 @@ services: - docker/lama/dev.env ldap: - image: docker.clkl.de/ldap/ladap:0.1 + image: docker.clkl.de/ldap/ldap:0.1-lama build: context: docker/ldap dockerfile: Dockerfile.ldap @@ -54,7 +54,7 @@ services: - ldap_net ldap_admin: - image: docker.clkl.de/ldap/admin:0.1 + image: docker.clkl.de/ldap/admin:0.1-lama build: context: docker/ldap dockerfile: Dockerfile.admin diff --git a/docker/lama/dev.env b/docker/lama/dev.env index 1a047bf..e8782d6 100644 --- a/docker/lama/dev.env +++ b/docker/lama/dev.env @@ -19,16 +19,12 @@ LDAP_ADMIN_USER_NAME=cn=admin,dc=test,dc=de LDAP_ADMIN_USER_PASSWORD=secret LDAP_USER_ENTRY=dc=test,dc=de -LDAP_USER_SELECTOR=(cn=%(user)s) +LDAP_USER_SELECTOR=(uid=%(user)s) LDAP_GROUP_ENTRY=dc=test,dc=de LDAP_GROUP_SELECTOR=(objectClass=groupOfNames) LDAP_GROUP_NAME_ATTR=cn EMAIL_BACKEND=file -#EMAIL_HOST=smtp.uni-bamberg.de -#EMAIL_PORT=587 -#EMAIL_USE_TLS=False -#EMAIL_USE_SSL=False DEFAULT_FROM_EMAIL= SERVER_EMAIL= diff --git a/docker/ldap/data/var/openldap-data/data.mdb b/docker/ldap/data/var/openldap-data/data.mdb index 8e6b048..4bd60d4 100644 Binary files a/docker/ldap/data/var/openldap-data/data.mdb and b/docker/ldap/data/var/openldap-data/data.mdb differ diff --git a/docker/ldap/data/var/openldap-data/lock.mdb b/docker/ldap/data/var/openldap-data/lock.mdb index 7e3e851..7e893ce 100644 Binary files a/docker/ldap/data/var/openldap-data/lock.mdb and b/docker/ldap/data/var/openldap-data/lock.mdb differ diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml index 7400dbf..2fdcea1 100644 --- a/docker/traefik/traefik.toml +++ b/docker/traefik/traefik.toml @@ -1,6 +1,6 @@ debug = false logLevel = "WARN" -defaultEntryPoints = ["https", "http"] +defaultEntryPoints = ["http"] [api]