diff --git a/README.md b/README.md index a7a46bbf..0df7e84c 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Once enabled, you'll find that Roundcube and Z-Push (ActiveSync) will use the re **On the remote Nextcloud** -Copy the file `setup/mods.available/remote-nextcloud-use-miab.sh` to the Nextcloud box and run it as root. This will configure Nextcloud's "LDAP user and group backend" with the MiaB-LDAP details and ensure the contacts and calendar apps are installed. *This does not replace or alter your ability to log into Nextcloud with any existing local Nextcloud accounts. It only allows MiaB-LDAP users to log into Nextcloud using their MiaB-LDAP credentials.* +Copy the file `setup/mods.available/connect-nextcloud-to-miab.sh` to the Nextcloud box and run it as root. This will configure Nextcloud's "LDAP user and group backend" with the MiaB-LDAP details and ensure the contacts and calendar apps are installed. *This does not replace or alter your ability to log into Nextcloud with any existing local Nextcloud accounts. It only allows MiaB-LDAP users to log into Nextcloud using their MiaB-LDAP credentials.* ## Under-the-Hood diff --git a/setup/mods.available/remote-nextcloud-use-miab.sh b/setup/mods.available/connect-nextcloud-to-miab.sh similarity index 97% rename from setup/mods.available/remote-nextcloud-use-miab.sh rename to setup/mods.available/connect-nextcloud-to-miab.sh index fc93b344..bd366bb7 100755 --- a/setup/mods.available/remote-nextcloud-use-miab.sh +++ b/setup/mods.available/connect-nextcloud-to-miab.sh @@ -11,6 +11,15 @@ # 4. optionally install and configure ssmtp so system mail is # sent to MiaB-LDAP # +# It should be run after configuring MiaB-LDAP to use a remote +# nextcloud, which is accomplished by enabling the setup mod +# "remote-nextcloud.sh." Creating a symbolic link to +# remote-nextcloud.sh in the directory +# /local with the same name enables the +# mod. You'll have to re-run setup by executing setup/start.sh (or +# ehdd/start-encrypted.sh if you're using encryption-at-rest). +# + VERBOSE=0 diff --git a/tests/suites/remote-nextcloud.sh b/tests/suites/remote-nextcloud.sh index 5a4533ba..0171b346 100644 --- a/tests/suites/remote-nextcloud.sh +++ b/tests/suites/remote-nextcloud.sh @@ -14,7 +14,7 @@ # - The remote Nextcloud has been configured to use MiaB-LDAP # for users and groups. # -# ie. remote-nextcloud-use-miab.sh was copied to the remote Nextcloud +# ie. connect-nextcloud-to-miab.sh was copied to the remote Nextcloud # server and was run successfully there # diff --git a/tests/system-setup/remote-nextcloud-docker.sh b/tests/system-setup/remote-nextcloud-docker.sh index 50bb413b..6f9e41b4 100755 --- a/tests/system-setup/remote-nextcloud-docker.sh +++ b/tests/system-setup/remote-nextcloud-docker.sh @@ -140,16 +140,16 @@ connect_nextcloud_to_miab() { || die "docker: update-ca-certificates failed" # execute the script that sets up Nextcloud - H2 "docker: run remote-nextcloud-use-miab.sh" - docker cp setup/mods.available/remote-nextcloud-use-miab.sh NC:/tmp \ - || die "docker: cp remote-nextcloud-use-miab.sh failed" - docker exec NC /tmp/remote-nextcloud-use-miab.sh \ + H2 "docker: run connect-nextcloud-to-miab.sh" + docker cp setup/mods.available/connect-nextcloud-to-miab.sh NC:/tmp \ + || die "docker: cp connect-nextcloud-to-miab.sh failed" + docker exec NC /tmp/connect-nextcloud-to-miab.sh \ . \ "$NC_ADMIN_USER" \ "$NC_ADMIN_PASSWORD" \ "$PRIMARY_HOSTNAME" \ "$LDAP_NEXTCLOUD_PASSWORD" \ - || die "docker: error running remote-nextcloud-use-miab.sh" + || die "docker: error running connect-nextcloud-to-miab.sh" }