From f9aa14eb8e549b755438a74170b3318c628b06b8 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 30 Mar 2024 13:49:19 +0100 Subject: [PATCH 1/2] Add ldap support --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0891779..95b8817 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,11 +31,13 @@ RUN buildDeps="\ libyaml-perl \ locales \ postgresql-client \ + libldap2-dev \ ${buildDeps} \ # configure locales && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \ && locale-gen \ # configure PHP extensions + && docker-php-source extract \ && docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos \ && docker-php-ext-install \ gettext \ @@ -44,6 +46,8 @@ RUN buildDeps="\ pdo_pgsql \ imap \ calendar \ + ldap \ + && docker-php-source delete \\ # configure apache && a2enmod rewrite \ && rm /etc/apache2/sites-enabled/000-default.conf \ From 282271fec7cd1fb41d6f72d5e9a73fc2a6e0b008 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 6 Jul 2024 02:27:41 +0200 Subject: [PATCH 2/2] Adding ldap.conf file with a basic config (trusting CA from /etc/ssl/certs) so ldap works with tls --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 95b8817..4fb8c50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,6 +71,10 @@ ARG AWL_URL=https://gitlab.com/davical-project/awl/-/archive/${AWL_VERSION}/awl. LABEL com.fts.davical-version=$DAVICAL_VERSION \ com.fts.awl-version=$AWL_VERSION +# Create ldap.conf and add basic configuration +RUN mkdir /etc/ldap +RUN echo "TLS_CACERTDIR /etc/ssl/certs" > /etc/ldap/ldap.conf + # Install AWL ARG AWL_DEST=/usr/share/awl RUN curl -o awl.tar.gz $AWL_URL \