From 64d24566b2b67dfdbb9181a40da4968111bd7f35 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Wed, 10 Jun 2020 07:49:17 -0400
Subject: [PATCH] Dump /etc/hosts on travis

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

diff --git a/.travis.yml b/.travis.yml
index 8f1598ce..5fb6275c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,20 +8,19 @@ os: linux
 dist: bionic
   
 before_install:
-  - echo "==== DUMP ENVIRONMENT ===="
+  - echo "==== ENVIRONMENT ===="
   - env | sort
   - echo "UMASK=$(umask)"
   #
-  - echo "==== DUMP AppArmor Status ===="
+  - echo "==== AppArmor Status ===="
   - (sudo aa-status; true)
   #
-  - echo "==== DUMP NETWORK INFO ===="
+  - echo "==== NETWORK INFO ===="
   - hostname -I
   - hostname -i
   - hostname
   - hostname --fqdn
   - ip add
-  - cat /etc/hosts
   
 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 1d8d9401..930b7879 100755
--- a/tests/assets/system-setup/remote-nextcloud-docker.sh
+++ b/tests/assets/system-setup/remote-nextcloud-docker.sh
@@ -104,12 +104,12 @@ miab_install() {
     if ! setup/start.sh; then
         H1 "OUTPUT OF SELECT FILES"
         dump_log "/var/log/syslog" 100
-        dump_conf_files
+        dump_conf_files "$TRAVIS"
         H2; H2 "End"; H2
         die "setup/start.sh failed!"
     fi
     H1 "OUTPUT OF SELECT FILES"
-    dump_conf_files
+    dump_conf_files "$TRAVIS"
     H2; H2 "End"; H2
 }
 
diff --git a/tests/assets/system-setup/setup-funcs.sh b/tests/assets/system-setup/setup-funcs.sh
index 7eb66b81..9154ec55 100755
--- a/tests/assets/system-setup/setup-funcs.sh
+++ b/tests/assets/system-setup/setup-funcs.sh
@@ -46,9 +46,21 @@ dump_log() {
 }
 
 dump_conf_files() {
-    dump_log "/etc/mailinabox.conf"
-    dump_log "/etc/nsd/nsd.conf"
-    dump_log "/etc/postfix/main.cf"
+    local skip
+    if [ $# -eq 0 ]; then
+        skip="false"
+    else
+        skip="true"
+        for item; do
+            [ "$item" == "true" ] skip="false"
+        done
+    fi
+    if [ "$skip" == "false" ]; then
+        dump_log "/etc/mailinabox.conf"
+        dump_log "/etc/hosts"
+        dump_log "/etc/nsd/nsd.conf"
+        dump_log "/etc/postfix/main.cf"
+    fi
 }
 
 install_qa_prerequisites() {