From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Aug 2017 21:26:20 +0000 (+0000)
Subject: reset: Destroy all user-defined security policies
X-Git-Tag: 009~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cac4fcd1f6f1217d2970cbb6da5afab2cde022c;p=network.git

reset: Destroy all user-defined security policies

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/functions/functions.vpn-security-policies b/src/functions/functions.vpn-security-policies
index 294f0dae..a74d3886 100644
--- a/src/functions/functions.vpn-security-policies
+++ b/src/functions/functions.vpn-security-policies
@@ -1093,8 +1093,15 @@ vpn_security_policies_list_all() {
 		basename ${security_policy}
 	done
 
+	# Add all user-defined policies
+	vpn_security_policies_list_user
+}
+
+vpn_security_policies_list_user() {
+	local security_policy
 	for security_policy in ${NETWORK_CONFIG_DIR}/vpn/security-policies/*; do
 		[ -f ${security_policy} ] || continue
+
 		basename ${security_policy}
 	done
 }
diff --git a/src/network b/src/network
index 03c33868..e0214181 100644
--- a/src/network
+++ b/src/network
@@ -1162,6 +1162,12 @@ cli_reset() {
 	# Stop strongswan
 	ipsec_strongswan_autostart
 
+	# Destroy all user-defined security policies
+	local secpol
+	for secpol in $(vpn_security_policies_list_user); do
+		vpn_security_policy_destroy "${secpol}"
+	done
+
 	local zone
 	for zone in $(zones_get --all); do
 		zone_destroy_now "${zone}"