diff options
| author | Saurabh Mohan <saurabh.mohan@vyatta.com> | 2013-01-22 12:29:10 -0800 |
|---|---|---|
| committer | Saurabh Mohan <saurabh.mohan@vyatta.com> | 2013-01-22 12:29:10 -0800 |
| commit | 1c1299d073afe47231c3e564cabdba6990007940 (patch) | |
| tree | 0706c642e8429c8fcf1e32f327512b72a3ddfbbd | |
| parent | 367c4bfd6f53c3e6ed38a9806b2fd0458b1077b0 (diff) | |
| download | vyatta-cfg-vpn-1c1299d073afe47231c3e564cabdba6990007940.tar.gz vyatta-cfg-vpn-1c1299d073afe47231c3e564cabdba6990007940.zip | |
Dmvpn merge with mirantis jan22-2013
| -rwxr-xr-x | scripts/dmvpn-config.pl | 4 | ||||
| -rw-r--r-- | templates/vpn/node.def | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/dmvpn-config.pl b/scripts/dmvpn-config.pl index e53368f..23b5440 100755 --- a/scripts/dmvpn-config.pl +++ b/scripts/dmvpn-config.pl @@ -146,7 +146,7 @@ if ( $vcVPN->exists('ipsec') ) { my $needs_passthrough = 'false'; my $tunKeyword = 'tunnel '."$tunnel"; - my $conn_head = "conn dmvpn-$profile-tunnel-$tunnel\n"; + my $conn_head = "conn vpnprof-tunnel-$tunnel\n"; $genout .= $conn_head; my $lip = $vc->returnValue("interfaces tunnel $tunnel local-ip"); @@ -371,7 +371,7 @@ if ( $vcVPN->exists('ipsec') ) { # $right = '%any'; if (not ($prev_profile eq $profile)){ - $genout_secrets .= "$lip $right "; + $genout_secrets .= "\n$lip $right "; if ( defined ($authid) ){ $genout_secrets .= "$authid "; } diff --git a/templates/vpn/node.def b/templates/vpn/node.def index b727afa..c504aaa 100644 --- a/templates/vpn/node.def +++ b/templates/vpn/node.def @@ -1,13 +1,13 @@ priority: 900 help: Virtual Private Network (VPN) end:sudo /opt/vyatta/sbin/vyatta-vti-config.pl || exit 1 - sudo /opt/vyatta/sbin/vpn-config.pl \ - --config_file='/etc/ipsec.conf' \ - --secrets_file='/etc/ipsec.secrets' \ - --init_script='/etc/init.d/ipsec' || exit 1 sudo /opt/vyatta/sbin/dmvpn-config.pl \ --config_file='/etc/dmvpn.conf' \ --secrets_file='/etc/dmvpn.secrets' \ --init_script='/etc/init.d/ipsec' || exit 1 + sudo /opt/vyatta/sbin/vpn-config.pl \ + --config_file='/etc/ipsec.conf' \ + --secrets_file='/etc/ipsec.secrets' \ + --init_script='/etc/init.d/ipsec' || exit 1 sudo /opt/vyatta/sbin/vyatta-update-l2tp.pl || exit 1 sudo /opt/vyatta/sbin/vyatta-update-pptp.pl || exit 1 |