diff --git a/Dockerfile b/Dockerfile index 8151c06..5071973 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,6 @@ RUN apk add --no-cache \ make \ musl \ musl-dev \ - openldap \ - openldap-dev \ openssl-dev \ pwgen \ py-pip \ @@ -46,7 +44,6 @@ RUN virtualenv -p python /var/lib/synapse RUN source /var/lib/synapse/bin/activate && \ pip install --upgrade setuptools && \ pip install psycopg2 && \ - pip install python-ldap && \ pip install https://github.com/matrix-org/synapse/tarball/$VERSION RUN apk del \ @@ -62,7 +59,6 @@ RUN apk del \ linux-headers \ make \ musl-dev \ - openldap-dev \ openssl-dev \ python-dev \ sqlite-libs \ diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl index 3a98a17..acd3ed8 100644 --- a/rootfs/etc/confd/templates/server.yaml.tmpl +++ b/rootfs/etc/confd/templates/server.yaml.tmpl @@ -133,15 +133,3 @@ perspectives: "ed25519:auto": key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw" -ldap_config: - enabled: true - uri: "{{getenv "LDAP_URI"}}" - start_tls: {{getenv "LDAP_TLS"}} - base: "{{getenv "LDAP_BASE_DN"}}" - attributes: - uid: "{{getenv "LDAP_UID_ATTRIBUTE"}}" - mail: "{{getenv "LDAP_MAIL_ATTRIBUTE"}}" - name: "{{getenv "LDAP_NAME_ATTRIBUTE"}}" - bind_dn: "{{getenv "LDAP_BIND_DN"}}" - bind_password: "{{getenv "LDAP_BIND_PASSWORD"}}" - filter: "{{getenv "LDAP_FILTER"}}"