From 9118f812de63247b4d4ee9e4262d040090697bea Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Wed, 24 Feb 2016 07:46:58 -0500 Subject: remove reference to dmvpn.secrets and chang dmvpn.conf to swanctl.conf --- scripts/vpn-config.pl | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'scripts/vpn-config.pl') diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index b913783..75d0e91 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -1146,17 +1146,11 @@ if ($vcVPN->exists('ipsec')) { } $genout .= "\ninclude $custom_include\n"; } - if (defined($custom_secrets)) { - if ( ! -e $custom_secrets) { - vpn_die(["vpn","ipsec","include-ipsec-secrets"],"$vpn_cfg_err The specified file for inclusion inside ipsec.secrets does not exist."); - } - $genout_secrets .= "\ninclude $custom_secrets\n"; - } - if (-e '/etc/dmvpn.conf') { - $genout .= "\ninclude /etc/dmvpn.conf\n"; - } - if (-e '/etc/dmvpn.secrets') { - $genout_secrets .= "\ninclude /etc/dmvpn.secrets\n"; + if (defined($custom_secrets)) { + if ( ! -e $custom_secrets) { + vpn_die(["vpn","ipsec","include-ipsec-secrets"],"$vpn_cfg_err The specified file for inclusion inside ipsec.secrets does not exist."); + } + $genout_secrets .= "\ninclude $custom_secrets\n"; } } else { -- cgit v1.2.3