From acdf14e63667034cda82dc75fcdcccd4b4367f6d Mon Sep 17 00:00:00 2001 From: Mark Plomer Date: Mon, 11 Mar 2019 10:09:03 +0100 Subject: [PATCH] implemented wildcard includes for ipsec/strongswan --- src/etc/inc/plugins.inc.d/ipsec.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index 191038309..807061bf5 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -1003,6 +1003,7 @@ function ipsec_configure_do($verbose = false, $interface = '') } $strongswan = generate_strongswan_conf($strongswanTree); + $strongswan .= "\ninclude /usr/local/etc/strongswan.*.conf\n"; @file_put_contents("/usr/local/etc/strongswan.conf", $strongswan); unset($strongswan); @@ -1096,6 +1097,7 @@ function ipsec_configure_do($verbose = false, $interface = '') unset($key); } + $pskconf .= "\ninclude /usr/local/etc/ipsec.*.secrets\n"; @file_put_contents("/usr/local/etc/ipsec.secrets", $pskconf); chmod("/usr/local/etc/ipsec.secrets", 0600); unset($pskconf); @@ -1550,6 +1552,7 @@ EOD; } } } + $ipsecconf .= "\ninclude /usr/local/etc/ipsec.*.conf\n"; // dump file, replace tabs for 2 spaces @file_put_contents("/usr/local/etc/ipsec.conf", str_replace("\t", ' ', $ipsecconf)); unset($ipsecconf);