diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-02-24 07:46:58 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-02-24 07:46:58 -0500 |
| commit | 9118f812de63247b4d4ee9e4262d040090697bea (patch) | |
| tree | 4cb5e3f13be6a69f9487af98937b3fc58fb41e93 /scripts | |
| parent | e6bde39b75eca1f4b30b7d4fa3c6eb9dd0100775 (diff) | |
| download | vyatta-cfg-vpn-9118f812de63247b4d4ee9e4262d040090697bea.tar.gz vyatta-cfg-vpn-9118f812de63247b4d4ee9e4262d040090697bea.zip | |
remove reference to dmvpn.secrets and chang dmvpn.conf to swanctl.conf
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vpn-config.pl | 16 |
1 files changed, 5 insertions, 11 deletions
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 { |