From c64eff46e6e69092bcb4f0d99d505700e61e4ecf Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 6 Sep 2011 11:49:01 -0500
Subject: Move the background monitoring for vpn under each of the categories
 as suggested by support (cherry picked from commit
 7621362a1a6ac0b5234fffdd4ff5fd1fe9f8625d)

---
 templates/monitor/vpn/all/background/node.def         | 1 +
 templates/monitor/vpn/all/background/start/node.def   | 3 +++
 templates/monitor/vpn/all/background/stop/node.def    | 3 +++
 templates/monitor/vpn/background/list/node.def        | 7 -------
 templates/monitor/vpn/background/node.def             | 1 -
 templates/monitor/vpn/background/start/all/node.def   | 3 ---
 templates/monitor/vpn/background/start/ipsec/node.def | 2 --
 templates/monitor/vpn/background/start/l2tp/node.def  | 2 --
 templates/monitor/vpn/background/start/node.def       | 1 -
 templates/monitor/vpn/background/start/pptp/node.def  | 2 --
 templates/monitor/vpn/background/stop/all/node.def    | 3 ---
 templates/monitor/vpn/background/stop/ipsec/node.def  | 2 --
 templates/monitor/vpn/background/stop/l2tp/node.def   | 2 --
 templates/monitor/vpn/background/stop/node.def        | 1 -
 templates/monitor/vpn/background/stop/pptp/node.def   | 2 --
 templates/monitor/vpn/ipsec/background/node.def       | 1 +
 templates/monitor/vpn/ipsec/background/start/node.def | 2 ++
 templates/monitor/vpn/ipsec/background/stop/node.def  | 2 ++
 templates/monitor/vpn/l2tp/background/node.def        | 1 +
 templates/monitor/vpn/l2tp/background/start/node.def  | 2 ++
 templates/monitor/vpn/l2tp/background/stop/node.def   | 2 ++
 templates/monitor/vpn/pptp/background/node.def        | 1 +
 templates/monitor/vpn/pptp/background/start/node.def  | 2 ++
 templates/monitor/vpn/pptp/background/stop/node.def   | 2 ++
 24 files changed, 22 insertions(+), 28 deletions(-)
 create mode 100644 templates/monitor/vpn/all/background/node.def
 create mode 100644 templates/monitor/vpn/all/background/start/node.def
 create mode 100644 templates/monitor/vpn/all/background/stop/node.def
 delete mode 100644 templates/monitor/vpn/background/list/node.def
 delete mode 100644 templates/monitor/vpn/background/node.def
 delete mode 100644 templates/monitor/vpn/background/start/all/node.def
 delete mode 100644 templates/monitor/vpn/background/start/ipsec/node.def
 delete mode 100644 templates/monitor/vpn/background/start/l2tp/node.def
 delete mode 100644 templates/monitor/vpn/background/start/node.def
 delete mode 100644 templates/monitor/vpn/background/start/pptp/node.def
 delete mode 100644 templates/monitor/vpn/background/stop/all/node.def
 delete mode 100644 templates/monitor/vpn/background/stop/ipsec/node.def
 delete mode 100644 templates/monitor/vpn/background/stop/l2tp/node.def
 delete mode 100644 templates/monitor/vpn/background/stop/node.def
 delete mode 100644 templates/monitor/vpn/background/stop/pptp/node.def
 create mode 100644 templates/monitor/vpn/ipsec/background/node.def
 create mode 100644 templates/monitor/vpn/ipsec/background/start/node.def
 create mode 100644 templates/monitor/vpn/ipsec/background/stop/node.def
 create mode 100644 templates/monitor/vpn/l2tp/background/node.def
 create mode 100644 templates/monitor/vpn/l2tp/background/start/node.def
 create mode 100644 templates/monitor/vpn/l2tp/background/stop/node.def
 create mode 100644 templates/monitor/vpn/pptp/background/node.def
 create mode 100644 templates/monitor/vpn/pptp/background/start/node.def
 create mode 100644 templates/monitor/vpn/pptp/background/stop/node.def

(limited to 'templates')

diff --git a/templates/monitor/vpn/all/background/node.def b/templates/monitor/vpn/all/background/node.def
new file mode 100644
index 0000000..b4eece2
--- /dev/null
+++ b/templates/monitor/vpn/all/background/node.def
@@ -0,0 +1 @@
+help: Monitor VPN in the background
diff --git a/templates/monitor/vpn/all/background/start/node.def b/templates/monitor/vpn/all/background/start/node.def
new file mode 100644
index 0000000..ac100e8
--- /dev/null
+++ b/templates/monitor/vpn/all/background/start/node.def
@@ -0,0 +1,3 @@
+help: Start background VPN monitoring
+run: ${vyatta_bindir}/vyatta-monitor-background "VPN-ALL" pluto pptp l2tp ppp
+
diff --git a/templates/monitor/vpn/all/background/stop/node.def b/templates/monitor/vpn/all/background/stop/node.def
new file mode 100644
index 0000000..8d735cd
--- /dev/null
+++ b/templates/monitor/vpn/all/background/stop/node.def
@@ -0,0 +1,3 @@
+help: Start background VPN monitoring
+run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-ALL"
+
diff --git a/templates/monitor/vpn/background/list/node.def b/templates/monitor/vpn/background/list/node.def
deleted file mode 100644
index 2fe1507..0000000
--- a/templates/monitor/vpn/background/list/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: List currently running VPN background montioring processes
-run: ARR=$(ls /var/run/vyatta/monitor/VPN*"$(tty| sed -e s-/--g -e s/dev//g)"*.pid)
-     ARR=${ARR[@]##*/}
-     ARR=${ARR[@]%%-pts*}
-     for i in "${ARR[@]}";do 
-        echo $i
-     done
diff --git a/templates/monitor/vpn/background/node.def b/templates/monitor/vpn/background/node.def
deleted file mode 100644
index 7fbfd18..0000000
--- a/templates/monitor/vpn/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Montior VPN in the background
diff --git a/templates/monitor/vpn/background/start/all/node.def b/templates/monitor/vpn/background/start/all/node.def
deleted file mode 100644
index ac100e8..0000000
--- a/templates/monitor/vpn/background/start/all/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background VPN monitoring
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-ALL" pluto pptp l2tp ppp
-
diff --git a/templates/monitor/vpn/background/start/ipsec/node.def b/templates/monitor/vpn/background/start/ipsec/node.def
deleted file mode 100644
index 7ba2631..0000000
--- a/templates/monitor/vpn/background/start/ipsec/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for IPSec VPN
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-IPSEC" pluto
diff --git a/templates/monitor/vpn/background/start/l2tp/node.def b/templates/monitor/vpn/background/start/l2tp/node.def
deleted file mode 100644
index a43440e..0000000
--- a/templates/monitor/vpn/background/start/l2tp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for L2TP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-L2TP:" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/background/start/node.def b/templates/monitor/vpn/background/start/node.def
deleted file mode 100644
index dc17ca0..0000000
--- a/templates/monitor/vpn/background/start/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Start VPN background monitoring
diff --git a/templates/monitor/vpn/background/start/pptp/node.def b/templates/monitor/vpn/background/start/pptp/node.def
deleted file mode 100644
index 7659282..0000000
--- a/templates/monitor/vpn/background/start/pptp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for PPTP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-PPTP" pptp ppp 
diff --git a/templates/monitor/vpn/background/stop/all/node.def b/templates/monitor/vpn/background/stop/all/node.def
deleted file mode 100644
index 8d735cd..0000000
--- a/templates/monitor/vpn/background/stop/all/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background VPN monitoring
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-ALL"
-
diff --git a/templates/monitor/vpn/background/stop/ipsec/node.def b/templates/monitor/vpn/background/stop/ipsec/node.def
deleted file mode 100644
index d6ea71c..0000000
--- a/templates/monitor/vpn/background/stop/ipsec/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for IPSec VPN
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-IPSEC" pluto
diff --git a/templates/monitor/vpn/background/stop/l2tp/node.def b/templates/monitor/vpn/background/stop/l2tp/node.def
deleted file mode 100644
index 2173baf..0000000
--- a/templates/monitor/vpn/background/stop/l2tp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for L2TP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-L2TP:" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/background/stop/node.def b/templates/monitor/vpn/background/stop/node.def
deleted file mode 100644
index e0b76b2..0000000
--- a/templates/monitor/vpn/background/stop/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Stop VPN background monitoring
diff --git a/templates/monitor/vpn/background/stop/pptp/node.def b/templates/monitor/vpn/background/stop/pptp/node.def
deleted file mode 100644
index d1879e4..0000000
--- a/templates/monitor/vpn/background/stop/pptp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for PPTP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-PPTP" pptp ppp 
diff --git a/templates/monitor/vpn/ipsec/background/node.def b/templates/monitor/vpn/ipsec/background/node.def
new file mode 100644
index 0000000..f32e862
--- /dev/null
+++ b/templates/monitor/vpn/ipsec/background/node.def
@@ -0,0 +1 @@
+help: Monitor IPSec in the background
diff --git a/templates/monitor/vpn/ipsec/background/start/node.def b/templates/monitor/vpn/ipsec/background/start/node.def
new file mode 100644
index 0000000..7ba2631
--- /dev/null
+++ b/templates/monitor/vpn/ipsec/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring for IPSec VPN
+run: ${vyatta_bindir}/vyatta-monitor-background "VPN-IPSEC" pluto
diff --git a/templates/monitor/vpn/ipsec/background/stop/node.def b/templates/monitor/vpn/ipsec/background/stop/node.def
new file mode 100644
index 0000000..d6ea71c
--- /dev/null
+++ b/templates/monitor/vpn/ipsec/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring for IPSec VPN
+run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-IPSEC" pluto
diff --git a/templates/monitor/vpn/l2tp/background/node.def b/templates/monitor/vpn/l2tp/background/node.def
new file mode 100644
index 0000000..d9b7697
--- /dev/null
+++ b/templates/monitor/vpn/l2tp/background/node.def
@@ -0,0 +1 @@
+help: Monitor L2TP in the background
diff --git a/templates/monitor/vpn/l2tp/background/start/node.def b/templates/monitor/vpn/l2tp/background/start/node.def
new file mode 100644
index 0000000..a43440e
--- /dev/null
+++ b/templates/monitor/vpn/l2tp/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring for L2TP VPN 
+run: ${vyatta_bindir}/vyatta-monitor-background "VPN-L2TP:" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/l2tp/background/stop/node.def b/templates/monitor/vpn/l2tp/background/stop/node.def
new file mode 100644
index 0000000..2173baf
--- /dev/null
+++ b/templates/monitor/vpn/l2tp/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring for L2TP VPN 
+run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-L2TP:" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/pptp/background/node.def b/templates/monitor/vpn/pptp/background/node.def
new file mode 100644
index 0000000..1eafbed
--- /dev/null
+++ b/templates/monitor/vpn/pptp/background/node.def
@@ -0,0 +1 @@
+help: Monitor PPTP in the background
diff --git a/templates/monitor/vpn/pptp/background/start/node.def b/templates/monitor/vpn/pptp/background/start/node.def
new file mode 100644
index 0000000..7659282
--- /dev/null
+++ b/templates/monitor/vpn/pptp/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring for PPTP VPN 
+run: ${vyatta_bindir}/vyatta-monitor-background "VPN-PPTP" pptp ppp 
diff --git a/templates/monitor/vpn/pptp/background/stop/node.def b/templates/monitor/vpn/pptp/background/stop/node.def
new file mode 100644
index 0000000..d1879e4
--- /dev/null
+++ b/templates/monitor/vpn/pptp/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring for PPTP VPN 
+run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-PPTP" pptp ppp 
-- 
cgit v1.2.3