From 0cd9e925668bd5fa0d179b82a25036c4de2fb896 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Tue, 9 Jun 2020 22:45:12 -0400
Subject: [PATCH] Try to deal with nsd failure under Travis

---
 .travis.yml                                   |  7 +++++++
 .../system-setup/remote-nextcloud-docker.sh   | 20 ++++++++++++++++---
 tests/assets/system-setup/setup-funcs.sh      |  4 ++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7479bc52..879d0a52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,13 @@ before_install:
   #
   - echo "==== DUMP AppArmor Status ===="
   - (sudo aa-status; true)
+  #
+  - echo "==== DUMP NETWORK INFO ===="
+  - (hostname -I; true)
+  - (hostname -i; true)
+  - (hostname; true)
+  - (hostname --fqdn; true)
+  - (if add; true)
   
 install:
   - sudo tests/assets/system-setup/remote-nextcloud-docker.sh
diff --git a/tests/assets/system-setup/remote-nextcloud-docker.sh b/tests/assets/system-setup/remote-nextcloud-docker.sh
index d269d49e..301c7efd 100755
--- a/tests/assets/system-setup/remote-nextcloud-docker.sh
+++ b/tests/assets/system-setup/remote-nextcloud-docker.sh
@@ -88,7 +88,7 @@ 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/mod.d/remote-nextcloud.sh symbolic link"
+    H2 "Create setup/mods.d/remote-nextcloud.sh symbolic link"
     if [ ! -e "setup/mods.d/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"
     fi
@@ -102,8 +102,22 @@ before_miab_install() {
 miab_install() {
     H1 "MIAB-LDAP INSTALL"
     if ! setup/start.sh; then
-        dump_log "/var/log/syslog" 200
-        die "setup/start.sh failed!"
+        local failure="true"
+        
+        if [ "$TRAVIS" == "true" ] && tail -10 /var/log/syslog | grep "Exception on /mail/users/add" >/dev/null; then
+            dump_log "/etc/mailinabox.conf"
+            H2 "Apply Travis-CI nsd fix"
+            travis_fix_nsd || die "Could not fix NSD startup issue"
+            H2 "Re-run firstuser.sh"
+            if setup/firstuser.sh; then
+                failure="false"
+            fi
+        fi
+        
+        if [ "$failure" == "true" ]; then
+            dump_log "/var/log/syslog" 100
+            die "setup/start.sh failed!"
+        fi
     fi
 }
 
diff --git a/tests/assets/system-setup/setup-funcs.sh b/tests/assets/system-setup/setup-funcs.sh
index 7f64da49..da2f16a3 100755
--- a/tests/assets/system-setup/setup-funcs.sh
+++ b/tests/assets/system-setup/setup-funcs.sh
@@ -26,7 +26,7 @@ dump_log() {
         tail -$lines "$log_file"
     else
         H1 "$title"
-        tail "$log_file"
+        cat "$log_file"
     fi
 }
 
@@ -95,7 +95,7 @@ travis_fix_nsd() {
     fi
     
     # nsd won't start on Travis-CI without the changes below: ip6 off and
-    # control-enable set to no. Even though the nsd docs says the
+    # control-enable set to no. Even though the nsd docs say the
     # default value for control-enable is no, running "nsd-checkconf -o
     # control-enable /etc/nsd/nsd.conf" returns "yes", so we explicitly
     # set it here.