external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

Explicitly create a /etc/ldap/ldap.conf in the docker image so ldap tools recognize the system's trusted root certificate list

Browse Source
This commit is contained in:
downtownallday 2021-09-14 08:18:53 -04:00
parent 3f2b2ef146
commit 3d32dbab22
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/ssl.sh
View File

@ -118,7 +118,7 @@ if [ ! -f $STORAGE_ROOT/ssl/ca_certificate.pem ]; then
CERT=$STORAGE_ROOT/ssl/ca_certificate.pem CERT=$STORAGE_ROOT/ssl/ca_certificate.pem
hide_output \ hide_output \
openssl req -new -x509 \ openssl req -new -x509 \
-days 3650 -sha256 \ -days 3650 -sha384 \
-key $STORAGE_ROOT/ssl/ca_private_key.pem \ -key $STORAGE_ROOT/ssl/ca_private_key.pem \
-passin 'pass:SECRET-PASSWORD' \ -passin 'pass:SECRET-PASSWORD' \
-out $CERT \ -out $CERT \

16
tests/system-setup/remote-nextcloud-docker.sh
View File

@ -123,8 +123,24 @@ install_nextcloud_docker() {
docker exec -u www-data NC ./occ app:enable user_ldap \ docker exec -u www-data NC ./occ app:enable user_ldap \
|| die "docker: enabling user_ldap failed ($?)" || die "docker: enabling user_ldap failed ($?)"
#
# integrate Nextcloud with MiaB-LDAP # integrate Nextcloud with MiaB-LDAP
#
H2 "docker: integrate Nextcloud with MiaB-LDAP" H2 "docker: integrate Nextcloud with MiaB-LDAP"
# create an /etc/ldap/ldap.conf specifying what root certificates
# are valid for peer cert validation by openldap tools
# (ldapsearch). This is needed for the docker debian image (not
# needed on ubuntu?) for the tools to recognize the root
# certificate copied above
echo "TLS_CACERT /etc/ssl/certs/ca-certificates.crt" > /tmp/ldap.conf.$$
docker exec NC mkdir /etc/ldap \
|| die "docker: mkdir /etc/ldap failed"
docker cp /tmp/ldap.conf.$$ NC:/etc/ldap/ldap.conf \
|| die "docker: could not copy /tmp/ldap.conf.$$ to NC:/etc/ldap"
rm -f /tmp/ldap.conf.$$
# execute the script that sets up Nextcloud
docker cp setup/mods.available/remote-nextcloud-use-miab.sh NC:/tmp \ docker cp setup/mods.available/remote-nextcloud-use-miab.sh NC:/tmp \
|| die "docker: cp remote-nextcloud-use-miab.sh failed" || die "docker: cp remote-nextcloud-use-miab.sh failed"
docker exec NC /tmp/remote-nextcloud-use-miab.sh \ docker exec NC /tmp/remote-nextcloud-use-miab.sh \