Move directory setup/mods.d to local

.travis.yml

@@ -33,6 +33,5 @@ script:
   #
   # launch automated tests, but skip tests that require remote
   # smtp support because Travis-CI blocks outgoing port 25
-  - sudo ls -al /etc/dovecot
   - sudo touch /etc/dovecot/sieve-spam.svbin
   - sudo tests/runner.sh -dumpoutput -no-smtp-remote default remote-nextcloud

README.md

@@ -16,7 +16,7 @@ To integrate Mail-in-a-Box w/LDAP (MiaB-LDAP) with Nextcloud, changes must be ma
 
 **On MiaB-LDAP**
 
-Enable the setup mod `remote-nextcloud.sh` by creating a symbolic link to it in setup/mods.d. Do this by running this command from the mailinabox directory: `ln -s ../mods.available/remote-nextcloud.sh setup/mods.d/remote-nextcloud.sh`. *During setup you will be prompted for the hostname and web prefix of your remote Nextcloud box.*
+Enable the setup mod `remote-nextcloud.sh` by creating the directory `local` and creating a symbolic link to it. Do this by running this command from the mailinabox directory: `ln -s ../setup/mods.available/remote-nextcloud.sh local/remote-nextcloud.sh`. *During setup you will be prompted for the hostname and web prefix of your remote Nextcloud box.*
 
 The setup mod will configure Roundcube and Z-Push (ActiveSync) to use the remote Nextcloud for contacts and calendar instead of the local Nextcloud, which will be disabled (browsing to /cloud will fail).
 

setup/mods.d/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

setup/start.sh

@@ -150,9 +150,11 @@ fi
 #
 # Run setup mods 
 #
-for mod in $(ls setup/mods.d | grep -v '~$'); do
+if [ -d local ]; then
-    setup/mods.d/$mod
+    for mod in $(ls local | grep -v '~$'); do
+        local/$mod
     done
+fi
 
 # Done.
 echo

tests/suites/remote-nextcloud.sh

@@ -2,15 +2,15 @@
 #	
 # Test the setup modification script setup/mods.available/remote-nextcloud.sh
 # Prerequisites:
-
+#
 #    - Nextcloud is already installed and MiaB-LDAP is already
 #      configured to use it.
 #
 #      ie. remote-nextcloud.sh was run on MiaB-LDAP by
 #          setup/start.sh because there was a symbolic link from
-#          setup/mods.d/remote-nextcloud.sh to the script in
+#          local/remote-nextcloud.sh to the script in
 #          mods.available
-
+#
 #    - The remote Nextcloud has been configured to use MiaB-LDAP
 #      for users and groups.
 #

tests/system-setup/remote-nextcloud-docker.sh

@@ -56,7 +56,6 @@ before_miab_install() {
     H1 "BEFORE MIAB-LDAP INSTALL"
 
     H2 "Update /etc/hosts"
-    #update_hosts_for_private_ip || die "Could not update /etc/hosts"
     set_system_hostname || die "Could not set hostname"
 
     # update system time
@@ -86,9 +85,10 @@ before_miab_install() {
     # enable the remote Nextcloud setup mod, which tells MiaB-LDAP to use
     # the remote Nextcloud for calendar and contacts instead of the
     # MiaB-installed one
-    H2 "Create setup/mods.d/remote-nextcloud.sh symbolic link"
+    H2 "Create local/remote-nextcloud.sh symbolic link"
-    if [ ! -e "setup/mods.d/remote-nextcloud.sh" ]; then
+    if [ ! -e "local/remote-nextcloud.sh" ]; then
-        ln -s "../mods.available/remote-nextcloud.sh" "setup/mods.d/remote-nextcloud.sh" || die "Could not create remote-nextcloud.sh symlink"
+        mkdir -p local
+        ln -s "../setup/mods.available/remote-nextcloud.sh" "local/remote-nextcloud.sh" || die "Could not create remote-nextcloud.sh symlink"
     fi
     
     # install Docker