dump-server-state: upstream release 22.04
Some checks reported errors
continuous-integration/drone/push Build was killed
Some checks reported errors
continuous-integration/drone/push Build was killed
This commit is contained in:
parent
726735d269
commit
e71201ab46
|
@ -21,7 +21,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
||||||
* evocheck: upstream release 22.03.1
|
* evocheck: upstream release 22.03.1
|
||||||
* evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware
|
* evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware
|
||||||
* evolinux-base: rename backup-server-state to dump-server-state
|
* evolinux-base: rename backup-server-state to dump-server-state
|
||||||
* dump-server-state: upstream release 22.03.10
|
* dump-server-state: upstream release 22.04
|
||||||
* generate-ldif: Add services check for bkctld
|
* generate-ldif: Add services check for bkctld
|
||||||
* minifirewall: restore "force-restart" and fix "restart-if-needed"
|
* minifirewall: restore "force-restart" and fix "restart-if-needed"
|
||||||
* minifirewall: tail template follows symlinks
|
* minifirewall: tail template follows symlinks
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
PROGNAME="dump-server-state"
|
PROGNAME="dump-server-state"
|
||||||
REPOSITORY="https://gitea.evolix.org/evolix/dump-server-state"
|
REPOSITORY="https://gitea.evolix.org/evolix/dump-server-state"
|
||||||
|
|
||||||
VERSION="22.03.10"
|
VERSION="22.04"
|
||||||
readonly VERSION
|
readonly VERSION
|
||||||
|
|
||||||
dump_dir=
|
dump_dir=
|
||||||
|
@ -425,9 +425,23 @@ task_iptables() {
|
||||||
debug "Task: iptables"
|
debug "Task: iptables"
|
||||||
|
|
||||||
iptables_bin=$(command -v iptables)
|
iptables_bin=$(command -v iptables)
|
||||||
|
ip6tables_bin=$(command -v ip6tables)
|
||||||
|
|
||||||
if [ -n "${iptables_bin}" ]; then
|
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_result=$({
|
||||||
|
printf "#### iptables --list ###############################\n"
|
||||||
|
${iptables_bin} --list --numeric --verbose --line-numbers
|
||||||
|
printf "\n### iptables --table nat --list ####################\n"
|
||||||
|
${iptables_bin} --table nat --list --numeric --verbose --line-numbers
|
||||||
|
printf "\n#### iptables --table mangle --list ################\n"
|
||||||
|
${iptables_bin} --table mangle --list --numeric --verbose --line-numbers
|
||||||
|
if [ -n "${ip6tables_bin}" ]; then
|
||||||
|
printf "\n#### ip6tables --list ##############################\n"
|
||||||
|
${ip6tables_bin} --list --numeric --verbose --line-numbers
|
||||||
|
printf "\n#### ip6tables --table mangle --list ###############\n"
|
||||||
|
${ip6tables_bin} --table mangle --list --numeric --verbose --line-numbers
|
||||||
|
fi
|
||||||
|
} > "${dump_dir}/iptables-v.txt")
|
||||||
last_rc=$?
|
last_rc=$?
|
||||||
|
|
||||||
if [ ${last_rc} -eq 0 ]; then
|
if [ ${last_rc} -eq 0 ]; then
|
||||||
|
@ -439,7 +453,20 @@ task_iptables() {
|
||||||
# rc=10
|
# rc=10
|
||||||
fi
|
fi
|
||||||
|
|
||||||
last_result=$({ ${iptables_bin} -L -n; ${iptables_bin} -t filter -L -n; } > "${dump_dir}/iptables.txt")
|
last_result=$({
|
||||||
|
printf "#### iptables --list ###############################\n"
|
||||||
|
${iptables_bin} --list --numeric
|
||||||
|
printf "\n### iptables --table nat --list ####################\n"
|
||||||
|
${iptables_bin} --table nat --list --numeric
|
||||||
|
printf "\n#### iptables --table mangle --list ################\n"
|
||||||
|
${iptables_bin} --table mangle --list --numeric
|
||||||
|
if [ -n "${ip6tables_bin}" ]; then
|
||||||
|
printf "\n#### ip6tables --list ##############################\n"
|
||||||
|
${ip6tables_bin} --list --numeric
|
||||||
|
printf "\n#### ip6tables --table mangle --list ###############\n"
|
||||||
|
${ip6tables_bin} --table mangle --list --numeric
|
||||||
|
fi
|
||||||
|
} > "${dump_dir}/iptables.txt")
|
||||||
last_rc=$?
|
last_rc=$?
|
||||||
|
|
||||||
if [ ${last_rc} -eq 0 ]; then
|
if [ ${last_rc} -eq 0 ]; then
|
||||||
|
|
Loading…
Reference in a new issue