From 2aefa0be35a42aaf8c98891b6632ef2a04626f8c Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 13 Oct 2019 10:21:04 -0400
Subject: [PATCH] iiab-diagnostics output reorder per @jvonau suggestion

---
 scripts/iiab-diagnostics | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/iiab-diagnostics b/scripts/iiab-diagnostics
index 46e8bda5f..65eeaa9f6 100755
--- a/scripts/iiab-diagnostics
+++ b/scripts/iiab-diagnostics
@@ -140,7 +140,6 @@ cat_file /etc/iiab/local_vars.yml
 cat_file /etc/iiab/config_vars.yml
 cat_file /etc/resolv.conf
 cat_file /etc/network/interfaces
-cat_file /usr/bin/iiab-gen-iptables
 
 # Record all Ansible variables: SLOW! OUTPUT TOO LARGE?
 #pushd /opt/iiab/iiab > /dev/null
@@ -148,8 +147,15 @@ cat_file /usr/bin/iiab-gen-iptables
 #popd > /dev/null
 #cat_file /tmp/all-ansible-vars
 
-echo -e "\n  3. Output of Commands:\n"
-cat_cmd 'sudo iptables-save' 'Firewall rules'
+echo -e "\n  3. Content of Directories, 1-level deep:\n"
+cat_dir /etc/network/interfaces.d
+cat_dir /etc/systemd/network
+cat_dir /etc/NetworkManager/system-connections
+cat_dir /etc/netplan
+#cat_dir /etc/sysconfig/network-scripts/if-cfg*    # No longer common.
+#cat_dir /etc/network    # Above file /etc/network/interfaces suffices
+
+echo -e "\n  4. Output of Commands:\n"
 cat_cmd 'uname -a' 'Linux kernel'
 cat_cmd 'free' 'RAM memory'
 cat_cmd 'lscpu' 'CPU details'
@@ -163,17 +169,13 @@ cat_cmd 'netstat -rn' 'Routing table'
 cat_cmd 'sudo netstat -natp' 'Ports/Services in use'
 cat_cmd 'systemctl status dnsmasq' 'Is dnsmasq Ok?'
 cat_cmd 'sudo journalctl -u dnsmasq' 'dnsmasq log'
-#cat_cmd 'ansible localhost -m setup 2>/dev/null' 'All Ansible facts'    # For cleaner scraping of Ansible vars, consider "./runrole all-vars /tmp/all-ansible-vars" 15-19 lines above?
+#cat_cmd 'ansible localhost -m setup 2>/dev/null' 'All Ansible facts'    # For cleaner scraping of Ansible vars, consider "./runrole all-vars /tmp/all-ansible-vars" 24-28 lines above?
 
-echo -e "\n  4. Content of Directories, 1-level deep:\n"
-cat_dir /etc/network/interfaces.d
-cat_dir /etc/systemd/network
-cat_dir /etc/NetworkManager/system-connections
-cat_dir /etc/netplan
-#cat_dir /etc/sysconfig/network-scripts/if-cfg*    # No longer common.
-#cat_dir /etc/network    # Above file /etc/network/interfaces suffices
+echo -e "\n  5. Firewall Rules:\n"
+cat_file /usr/bin/iiab-gen-iptables
+cat_cmd 'sudo iptables-save' 'Firewall rules'
 
-echo -e "\n  5. Log Files: (last 100 lines of each)\n"
+echo -e "\n  6. Log Files: (last 100 lines of each)\n"
 cat_tail /opt/iiab/iiab/iiab-install.log 100
 cat_tail /opt/iiab/iiab/iiab-network.log 100
 cat_tail /opt/iiab/iiab/iiab-debug.log 100