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

Implement Nico's suggestions

Browse source 
Removed unnecessary code from gencode-remote
This commit is contained in:
Jake Guffey 2012-09-21 10:11:56 -04:00
parent 058625cc68
commit 9a45333e82
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,24 +34,13 @@ if [ -f "${rcvar}.old" ]; then # rcvar.old exists, we must need to disable pf
pfctl -d || true pfctl -d || true
# Cleanup # Cleanup
rm -f "${rcvar}.old" rm -f "${rcvar}.old"
# This file shouldn't exist, but just in case...
if [ -f "${rcvar}" ]; then
rm -f "${rcvar}"
fi
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
if [ -f "${rcvar}" ]; then
rm -f "${rcvar}"
fi
mv "${rcvar}.new" "${rcvar}" mv "${rcvar}.new" "${rcvar}"
pfctl -e || true pfctl -e || true
pfctl -f "${rcvar}" pfctl -f "${rcvar}"
ret="$?" if [ "\$?" -ne "0" ]; then # failed to configure new ruleset
# Cleanup
# This file shouldn't exist, but just in case
rm -f "${rcvar}.old"
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
fi fi