From 38df35cbe4d7f15447063d8496cdd13970cae16d Mon Sep 17 00:00:00 2001 From: John Southworth Date: Fri, 28 Jan 2011 13:58:51 -0600 Subject: Work on new IPsec operational mode script. Integrated with the vyatta-cli --- templates/show/vpn/ike/sa/nat-traversal/node.def | 2 +- templates/show/vpn/ike/sa/node.def | 2 +- templates/show/vpn/ike/sa/peer/node.tag/node.def | 4 ++-- templates/show/vpn/ipsec/sa/detail/node.def | 2 +- templates/show/vpn/ipsec/sa/nat-traversal/node.def | 2 +- templates/show/vpn/ipsec/sa/node.def | 2 +- templates/show/vpn/ipsec/sa/peer/node.tag/node.def | 4 ++-- templates/show/vpn/ipsec/sa/statistics/node.def | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'templates') diff --git a/templates/show/vpn/ike/sa/nat-traversal/node.def b/templates/show/vpn/ike/sa/nat-traversal/node.def index 51ba049..3855c49 100644 --- a/templates/show/vpn/ike/sa/nat-traversal/node.def +++ b/templates/show/vpn/ike/sa/nat-traversal/node.def @@ -1,2 +1,2 @@ help: Show all currently active IKE Security Associations (SA) that are using NAT Traversal -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ike_sa.xsl --pname nat --pval enabled +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ike-sa-natt diff --git a/templates/show/vpn/ike/sa/node.def b/templates/show/vpn/ike/sa/node.def index 66a68bf..051d657 100644 --- a/templates/show/vpn/ike/sa/node.def +++ b/templates/show/vpn/ike/sa/node.def @@ -1,2 +1,2 @@ help: Show all currently active IKE Security Associations (SA) -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ike_sa.xsl +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ike-sa diff --git a/templates/show/vpn/ike/sa/peer/node.tag/node.def b/templates/show/vpn/ike/sa/peer/node.tag/node.def index 358d898..a84cc0e 100644 --- a/templates/show/vpn/ike/sa/peer/node.tag/node.def +++ b/templates/show/vpn/ike/sa/peer/node.tag/node.def @@ -1,3 +1,3 @@ help: Show all currently active IKE Security Associations (SA) for a specific peer -allowed: /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=get-all-peers -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ike_sa.xsl --pname peer --pval "$6" +allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-peers-for-cli +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ike-sa-peer="$6" diff --git a/templates/show/vpn/ipsec/sa/detail/node.def b/templates/show/vpn/ipsec/sa/detail/node.def index 202296e..d5307a5 100644 --- a/templates/show/vpn/ipsec/sa/detail/node.def +++ b/templates/show/vpn/ipsec/sa/detail/node.def @@ -1,2 +1,2 @@ help: Show detailed all active IPsec Security Associations (SA) -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa.xsl --pname detail --pval y +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-detail diff --git a/templates/show/vpn/ipsec/sa/nat-traversal/node.def b/templates/show/vpn/ipsec/sa/nat-traversal/node.def index 8291c98..7ea610b 100644 --- a/templates/show/vpn/ipsec/sa/nat-traversal/node.def +++ b/templates/show/vpn/ipsec/sa/nat-traversal/node.def @@ -1,2 +1,2 @@ help: Show all active IPsec Security Associations (SA) that are using NAT Traversal -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa.xsl --pname nat --pval enabled +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-natt diff --git a/templates/show/vpn/ipsec/sa/node.def b/templates/show/vpn/ipsec/sa/node.def index 9897b47..a3f0f6b 100644 --- a/templates/show/vpn/ipsec/sa/node.def +++ b/templates/show/vpn/ipsec/sa/node.def @@ -1,2 +1,2 @@ help: Show all active IPsec Security Associations (SA) -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa.xsl +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa diff --git a/templates/show/vpn/ipsec/sa/peer/node.tag/node.def b/templates/show/vpn/ipsec/sa/peer/node.tag/node.def index 210c40a..ad3e8f8 100644 --- a/templates/show/vpn/ipsec/sa/peer/node.tag/node.def +++ b/templates/show/vpn/ipsec/sa/peer/node.tag/node.def @@ -1,3 +1,3 @@ help: Show all active IPsec Security Associations (SA) for a specific peer -allowed: /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=get-all-peers -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa.xsl --pname peer --pval "$6" +allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-peers-for-cli +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-peer="$6" diff --git a/templates/show/vpn/ipsec/sa/statistics/node.def b/templates/show/vpn/ipsec/sa/statistics/node.def index 6104cfe..ad7c5d8 100644 --- a/templates/show/vpn/ipsec/sa/statistics/node.def +++ b/templates/show/vpn/ipsec/sa/statistics/node.def @@ -1,2 +1,2 @@ help: Show statistics of all active tunnels that have IPsec Security Associations (SA) -run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa_statistics.xsl +run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-stats -- cgit v1.2.3