separated add and delete into their own functions.

This commit is contained in:
Culsu
2020-11-30 23:04:30 +01:00
parent dd55fb6ca5
commit 6c544268ed

27
jaildk
View File

@@ -1474,16 +1474,11 @@ jaildk_ipfw() {
bold "Managing IPFW Rules..." bold "Managing IPFW Rules..."
case $mode in case $mode in
start) start)
# Deleting existing rules first to avoid duplicates. jaildk_ipfw_delete $jail "y"
ipfw show | grep -E "// $jail\$" | while read rule; do sh -c "ipfw delete $(echo $rule| awk '{print $1}')"; done jaildk_ipfw_add $jail
# Getting current jails IP..
jailip=$(jls | grep -E "$jail\$" | awk '{print $2}')
# Adding rules
cat /jail/etc/revprx/ipfw.conf | awk -v jailname="$jail" '{print "ipfw add "$0" // " jailname}' | sed -E "s/\\\$ip/$jailip/g" | while read rule; do $rule; done
;; ;;
stop) stop)
# Deleting rules jaildk_ipfw_delete $jail
ipfw show | grep -E "// $jail\$" | while read rule; do bold "Deleting rule $rule"; sh -c "ipfw delete $(echo $rule| awk '{print $1}')"; done
;; ;;
esac esac
bold "... done" bold "... done"
@@ -1491,6 +1486,22 @@ jaildk_ipfw() {
fi fi
} }
jaildk_ipfw_add() {
jail=$1
# Getting current jails IP..
jailip=$(jls | grep -E "$jail\$" | awk '{print $2}')
# Adding rules
cat $j/etc/$jail/ipfw.conf | awk -v jailname="$jail" '{print "ipfw add "$0" // " jailname}' | sed -E "s/\\\$ip/$jailip/g" | while read rule; do $rule; done
}
jaildk_ipfw_delete() {
jail=$1
noout=$2
# Deleting rules
ipfw show | grep -E "// $jail\$" | while read rule; do [ -z "$2" ] && bold "Deleting rule $rule"; sh -c "ipfw delete $(echo $rule| awk '{print $1}')"; done
}
########################## ##########################
# #