evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 19 Releases 34 Wiki Activity

Release 22.05 #155

Merged
jlecour merged 81 commits from unstable into stable 2022-05-10 17:01:18 +02:00
Conversation 0 Commits 81 Files changed 72 +31 -26
1 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b4f35af35c - Show all commits

57
evolinux-base/files/backup-server-state.sh
View file

@ -426,37 +426,42 @@ backup_iptables() {
debug "Backup iptables" debug "Backup iptables"
iptables_bin=$(command -v iptables) iptables_bin=$(command -v iptables)
nft_bin=$(command -v nft)
if [ -n "${iptables_bin}" ]; then if [ -n "${nft_bin}" ]; then
last_result=$({ ${iptables_bin} -L -n -v; ${iptables_bin} -t filter -L -n -v; } > "${backup_dir}/iptables.txt") debug "* nft found, skip iptables"
last_rc=$?
if [ ${last_rc} -eq 0 ]; then
debug "* iptables OK"
else
debug "* iptables ERROR"
debug "${last_result}"
rc=10
fi
else else
debug "* iptables not found" if [ -n "${iptables_bin}" ]; then
fi last_result=$({ ${iptables_bin} -L -n -v; ${iptables_bin} -t filter -L -n -v; } >> "${backup_dir}/iptables.txt")
last_rc=$?
iptables_save_bin=$(command -v iptables-save) if [ ${last_rc} -eq 0 ]; then
debug "* iptables OK"
if [ -n "${iptables_save_bin}" ]; then else
last_result=$(${iptables_save_bin} > "${backup_dir}/iptables-save.txt") debug "* iptables ERROR"
last_rc=$? debug "${last_result}"
rc=10
if [ ${last_rc} -eq 0 ]; then fi
debug "* iptables-save OK"
else else
debug "* iptables-save ERROR" debug "* iptables not found"
debug "${last_result}" fi
rc=10
iptables_save_bin=$(command -v iptables-save)
if [ -n "${iptables_save_bin}" ]; then
last_result=$(${iptables_save_bin} > "${backup_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
else
debug "* iptables-save not found"
fi fi
} }