From 12b2b88d03ce3527a46abc3c1e5cf9e8b8cd5238 Mon Sep 17 00:00:00 2001
From: Jeff Leung <jleung@v10networks.ca>
Date: Wed, 28 Jan 2015 08:26:51 +0000
Subject: Update pluto.pid references to charon.pid

Since pluto doesn't exist anymore in strongSwan 5.0 and later series,
we are updating references from pluto* to charon*.
---
 templates/restart/vpn/node.def                                  | 2 +-
 templates/show/vpn/debug/detail/node.def                        | 2 +-
 templates/show/vpn/debug/node.def                               | 2 +-
 templates/show/vpn/debug/peer/node.tag/node.def                 | 2 +-
 templates/show/vpn/debug/peer/node.tag/tunnel/node.tag/node.def | 2 +-
 templates/show/vpn/ipsec/status/node.def                        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/restart/vpn/node.def b/templates/restart/vpn/node.def
index 7cb9387..6d0f50c 100644
--- a/templates/restart/vpn/node.def
+++ b/templates/restart/vpn/node.def
@@ -1,7 +1,7 @@
 help: Restart IPsec VPN
 run: if [ -n "$(cli-shell-api returnActiveValues \
                   vpn ipsec ipsec-interfaces interface)" ]; then
-       if pgrep pluto > /dev/null
+       if pgrep charon > /dev/null
        then
         /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=clear-vpn-ipsec-process
        else
diff --git a/templates/show/vpn/debug/detail/node.def b/templates/show/vpn/debug/detail/node.def
index ee3604d..0f88f1e 100644
--- a/templates/show/vpn/debug/detail/node.def
+++ b/templates/show/vpn/debug/detail/node.def
@@ -1,7 +1,7 @@
 help: Show detailed VPN debugging information
 run: if [ -n "$(cli-shell-api returnActiveValues \
                   vpn ipsec ipsec-interfaces interface)" ]; then
-       if pgrep pluto > /dev/null
+       if pgrep charon > /dev/null
        then
         /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=show-vpn-debug-detail
        else
diff --git a/templates/show/vpn/debug/node.def b/templates/show/vpn/debug/node.def
index 7a33888..281228a 100644
--- a/templates/show/vpn/debug/node.def
+++ b/templates/show/vpn/debug/node.def
@@ -1,7 +1,7 @@
 help: Show VPN debugging information
 run: if [ -n "$(cli-shell-api returnActiveValues \
                   vpn ipsec ipsec-interfaces interface)" ]; then
-       if pgrep pluto > /dev/null
+       if pgrep charon > /dev/null
        then
         /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=show-vpn-debug
        else
diff --git a/templates/show/vpn/debug/peer/node.tag/node.def b/templates/show/vpn/debug/peer/node.tag/node.def
index a27063a..a3a9573 100644
--- a/templates/show/vpn/debug/peer/node.tag/node.def
+++ b/templates/show/vpn/debug/peer/node.tag/node.def
@@ -2,7 +2,7 @@ help: Show debugging information for a peer
 allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-peers-for-cli
 run: if [ -n "$(cli-shell-api returnActiveValues \
                   vpn ipsec ipsec-interfaces interface)" ]; then
-       if pgrep pluto > /dev/null
+       if pgrep charon > /dev/null
        then
         /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=show-vpn-debug | grep peer-$5
        else
diff --git a/templates/show/vpn/debug/peer/node.tag/tunnel/node.tag/node.def b/templates/show/vpn/debug/peer/node.tag/tunnel/node.tag/node.def
index c141ac0..3c96973 100644
--- a/templates/show/vpn/debug/peer/node.tag/tunnel/node.tag/node.def
+++ b/templates/show/vpn/debug/peer/node.tag/tunnel/node.tag/node.def
@@ -2,7 +2,7 @@ help: Show debugging information for a peer's tunnel
 allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-conn-for-cli=${COMP_WORDS[4]}
 run: if [ -n "$(cli-shell-api returnActiveValues \
                   vpn ipsec ipsec-interfaces interface)" ]; then
-       if pgrep pluto > /dev/null
+       if pgrep charon > /dev/null
        then
         /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=show-vpn-debug | grep "peer-$5-tunnel-$7"
        else
diff --git a/templates/show/vpn/ipsec/status/node.def b/templates/show/vpn/ipsec/status/node.def
index bf4ebf7..3c48c60 100644
--- a/templates/show/vpn/ipsec/status/node.def
+++ b/templates/show/vpn/ipsec/status/node.def
@@ -1,5 +1,5 @@
 help: Show status of IPsec process
-run: if pgrep pluto >&/dev/null; then
+run: if pgrep charon >&/dev/null; then
         /opt/vyatta/bin/sudo-users/vyatta-show-ipsec-status.pl
      else
         echo -e "IPSec Process NOT Running\n"
-- 
cgit v1.2.3