From db8e0fdf660ef944f962109f4f732914d4fde531 Mon Sep 17 00:00:00 2001 From: downtownallday Date: Wed, 27 Oct 2021 08:19:32 -0400 Subject: [PATCH] Remove /etc/ldap/ldap.conf creation as it's now created by the Nextcloud docker image --- tests/system-setup/remote-nextcloud-docker.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/system-setup/remote-nextcloud-docker.sh b/tests/system-setup/remote-nextcloud-docker.sh index 3cb3ef68..9eea3638 100755 --- a/tests/system-setup/remote-nextcloud-docker.sh +++ b/tests/system-setup/remote-nextcloud-docker.sh @@ -128,18 +128,6 @@ install_nextcloud_docker() { # 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 \ || die "docker: cp remote-nextcloud-use-miab.sh failed"