mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Removed ${rcvar} but never renamed ${rcvar}.new

Browse source 
Was trying to load ${rcvar} into pf, but couldn't because new ruleset was never renamed.
This commit is contained in:
Jake Guffey 2012-09-19 17:04:03 -04:00
commit 629f751726
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
conf/type/__pf_apply/gencode-remote
View file

@ -39,13 +39,14 @@ if [ -f "${rcvar}.old" ]; then # rcvar.old exists, we must need to disable pf
elif [ -f "${rcvar}.new" ]; then # rcvar.new exists, we must need to apply it elif [ -f "${rcvar}.new" ]; then # rcvar.new exists, we must need to apply it
# Ensure that pf is enabled in the first place # Ensure that pf is enabled in the first place
# If it already is enabled, pfctl -e returns 1, go on with life # If it already is enabled, pfctl -e returns 1, go on with life
[ -f "${rcvar}" ] && rm -f "${rcvar}"
mv "${rcvar}.new" "${rcvar}"
pfctl -e || true pfctl -e || true
pfctl -f "${rcvar}" pfctl -f "${rcvar}"
ret="$?" ret="$?"
# Cleanup # Cleanup
# This file shouldn't exist, but just in case
rm -f "${rcvar}.old" rm -f "${rcvar}.old"
# This file shouldn't exist, but just in case...
[ -f "${rcvar}" ] && rm -f "${rcvar}"
if [ "$ret" -ne "0" ]; then # failed to configure new ruleset if [ "$ret" -ne "0" ]; then # failed to configure new ruleset
echo "Failed to configure the new ruleset on ${__target_host}!" >&2 echo "Failed to configure the new ruleset on ${__target_host}!" >&2
fi fi