Merge pull request #140 from mekanix/feature/pre_down

Add pre_down hook
cbsd · May 19, 2020 · aa9887d · aa9887d
2 parents 99170a6 + e2479aa
commit aa9887d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/mk/jail-service.mk b/mk/jail-service.mk
@@ -62,8 +62,15 @@ provision: setup
 	@${MAKE} ${MAKEFLAGS} provision-${provisioner}
 .endfor
 
+.if target(pre_down)
+down: setup pre_down
+.else
 down: setup
+.endif
 	@sudo cbsd jstop ${SERVICE} || true
+.if target(post_down)
+	@${MAKE} ${MAKEFLAGS} post_down
+.endif
 
 destroy:
 	@rm -f cbsd.conf .provisioned

diff --git a/templates/export-ports.sh b/templates/export-ports.sh
@@ -14,5 +14,5 @@ done
 
 
 if [ ! -z "${EXPORTED_PORTS}" ]; then
-  echo "rdr pass inet proto tcp from any to any port { ${EXPORTED_PORTS} } -> ${jname}.${DOMAIN}" | pfctl -a "cbsd/${jname}" -f -
+  echo "rdr pass inet proto { tcp, udp } from any to any port { ${EXPORTED_PORTS} } -> ${jname}.${DOMAIN}" | pfctl -a "cbsd/${jname}" -f -
 fi