Merge pull request #7397 from nextcloud/enh/noid/remove-custom-ldaps-logic

nextcloud-entrypoint: remove custom logic for ldap.conf again as it does not work
This commit is contained in:
Simon L. 2026-01-14 13:28:15 +01:00 committed by GitHub
commit 6aef1c32cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -65,14 +65,6 @@ if env | grep -q NEXTCLOUD_TRUSTED_CERTIFICATES_; then
done
# Custom logic for ldap conf
if ! grep -q "TLS_" /etc/openldap/ldap.conf; then
cat << EOL >> /etc/openldap/ldap.conf
TLS_CACERT $CERTIFICATE_BUNDLE
TLS_REQCERT try
EOL
fi
# Backwards compatibility with older instances
if [ -f "/var/www/html/config/postgres.config.php" ]; then
sed -i "s|/var/www/html/data/certificates/POSTGRES|/var/www/html/data/certificates/ca-bundle.crt|" /var/www/html/config/postgres.config.php