dump-server-state: upstream release 22.03.10

CHANGELOG.md

@@ -17,6 +17,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * evocheck: upstream release 22.03.1
 * evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware
 * evolinux-base: rename backup-server-state to dump-server-state
+* dump-server-state: upstream release 22.03.10
 * generate-ldif: Add services check for bkctld
 * minifirewall: restore "force-restart" and fix "restart-if-needed"
 * minifirewall: tail template follows symlinks

evolinux-base/files/dump-server-state.sh

@@ -3,7 +3,7 @@
 PROGNAME="dump-server-state"
 REPOSITORY="https://gitea.evolix.org/evolix/dump-server-state"
 
-VERSION="22.03.9"
+VERSION="22.03.10"
 readonly VERSION
 
 dump_dir=
@@ -425,52 +425,65 @@ task_iptables() {
     debug "Task: iptables"
 
     iptables_bin=$(command -v iptables)
+
+    if [ -n "${iptables_bin}" ]; then
+        last_result=$({ ${iptables_bin} -L -n -v; ${iptables_bin} -t filter -L -n -v; } > "${dump_dir}/iptables-v.txt")
+        last_rc=$?
+
+        if [ ${last_rc} -eq 0 ]; then
+            debug "* iptables -v OK"
+        else
+            debug "* iptables -v ERROR"
+            debug "${last_result}"
+            # Ignore errors because we don't know if this is nft related or a real error
+            # rc=10
+        fi
+
+        last_result=$({ ${iptables_bin} -L -n; ${iptables_bin} -t filter -L -n; } > "${dump_dir}/iptables.txt")
+        last_rc=$?
+
+        if [ ${last_rc} -eq 0 ]; then
+            debug "* iptables OK"
+        else
+            debug "* iptables ERROR"
+            debug "${last_result}"
+            # Ignore errors because we don't know if this is nft related or a real error
+            # rc=10
+        fi
+    else
+        debug "* iptables not found"
+    fi
+
+    iptables_save_bin=$(command -v iptables-save)
+
+    if [ -n "${iptables_save_bin}" ]; then
+        last_result=$(${iptables_save_bin} > "${dump_dir}/iptables-save.txt")
+        last_rc=$?
+
+        if [ ${last_rc} -eq 0 ]; then
+            debug "* iptables-save OK"
+        else
+            debug "* iptables-save ERROR"
+            debug "${last_result}"
+            # Ignore errors because we don't know if this is nft related or a real error
+            # rc=10
+        fi
+    else
+        debug "* iptables-save not found"
+    fi
+
     nft_bin=$(command -v nft)
 
     if [ -n "${nft_bin}" ]; then
-        debug "* nft found, skip iptables"
+        last_result=$(${nft_bin} list ruleset > "${dump_dir}/nft-ruleset.txt")
-    else
+        last_rc=$?
-        if [ -n "${iptables_bin}" ]; then
-            last_result=$({ ${iptables_bin} -L -n -v; ${iptables_bin} -t filter -L -n -v; } >> "${dump_dir}/iptables-v.txt")
-            last_rc=$?
 
-            if [ ${last_rc} -eq 0 ]; then
+        if [ ${last_rc} -eq 0 ]; then
-                debug "* iptables -v OK"
+            debug "* nft ruleset OK"
-            else
-                debug "* iptables -v ERROR"
-                debug "${last_result}"
-                rc=10
-            fi
-
-            last_result=$({ ${iptables_bin} -L -n; ${iptables_bin} -t filter -L -n; } >> "${dump_dir}/iptables.txt")
-            last_rc=$?
-
-            if [ ${last_rc} -eq 0 ]; then
-                debug "* iptables OK"
-            else
-                debug "* iptables ERROR"
-                debug "${last_result}"
-                rc=10
-            fi
         else
-            debug "* iptables not found"
+            debug "* nft ruleset ERROR"
-        fi
+            debug "${last_result}"
-
+            rc=10
-        iptables_save_bin=$(command -v iptables-save)
-
-        if [ -n "${iptables_save_bin}" ]; then
-            last_result=$(${iptables_save_bin} > "${dump_dir}/iptables-save.txt")
-            last_rc=$?
-
-            if [ ${last_rc} -eq 0 ]; then
-                debug "* iptables-save OK"
-            else
-                debug "* iptables-save ERROR"
-                debug "${last_result}"
-                rc=10
-            fi
-        else
-            debug "* iptables-save not found"
         fi
     fi
 }