diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2009-12-10 17:19:18 -0800 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2010-01-12 16:43:37 -0800 |
| commit | 04cb338f62c4e6a8ebd062a524cd2c1c6a3489f4 (patch) | |
| tree | e8b7a417a86f2a52ceed757bf6620a1fb03067ce /scripts | |
| parent | 03f361bac3eb20554b7487d4b4b6a56cbeae62a2 (diff) | |
| download | vyatta-op-vpn-04cb338f62c4e6a8ebd062a524cd2c1c6a3489f4.tar.gz vyatta-op-vpn-04cb338f62c4e6a8ebd062a524cd2c1c6a3489f4.zip | |
fix show vpn commands to work with strongswan
(cherry picked from commit 32927e013922e1a79b0f214773e2500a1260871a)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/gen_local_rsa_key.pl | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-vpn-op.pl | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/gen_local_rsa_key.pl b/scripts/gen_local_rsa_key.pl index 2be6b2a..9bf914c 100755 --- a/scripts/gen_local_rsa_key.pl +++ b/scripts/gen_local_rsa_key.pl @@ -104,7 +104,7 @@ my $file_pubkey = rsa_get_local_pubkey($local_key_file); if ($file_pubkey ne 0) { print "\nYour new local RSA key has been generated\n"; print "The public portion of the key is:\n\n$file_pubkey\n\n"; - $cmd = "ipsec auto --rereadall 2> /dev/null"; + $cmd = "ipsec rereadall 2> /dev/null"; vpn_debug $cmd; system $cmd; exit 0; diff --git a/scripts/vyatta-vpn-op.pl b/scripts/vyatta-vpn-op.pl index db44959..adcbf84 100755 --- a/scripts/vyatta-vpn-op.pl +++ b/scripts/vyatta-vpn-op.pl @@ -62,13 +62,14 @@ if ($op eq '') { } if ($op eq 'clear-vpn-ipsec-process') { - system 'sudo /usr/sbin/ipsec restart'; + print "Clearing IPsec process...\n"; + system 'sudo /usr/sbin/ipsec restart >&/dev/null'; } elsif ($op eq 'show-vpn-debug') { - system 'sudo /usr/sbin/ipsec status'; + system 'sudo /usr/sbin/ipsec statusall'; } elsif ($op eq 'show-vpn-debug-detail') { - system 'sudo /usr/sbin/ipsec statusall'; + system 'sudo /usr/lib/ipsec/barf'; } elsif ($op eq 'get-all-peers') { # get all site-to-site peers |