From f96435277e4c2b1e305f10f39206e281693f6232 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 14 Aug 2021 18:24:13 +0200
Subject: op-mode: combine two "show vpn" definitions

---
 op-mode-definitions/vpn-ipsec.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'op-mode-definitions/vpn-ipsec.xml.in')

diff --git a/op-mode-definitions/vpn-ipsec.xml.in b/op-mode-definitions/vpn-ipsec.xml.in
index 20f275e9b..18b72b87c 100644
--- a/op-mode-definitions/vpn-ipsec.xml.in
+++ b/op-mode-definitions/vpn-ipsec.xml.in
@@ -140,6 +140,12 @@
                 </properties>
                 <command>sudo ip xfrm policy list</command>
               </node>
+              <leafNode name="remote-access">
+                 <properties>
+                   <help>Show active VPN server sessions</help>
+                 </properties>
+                <command>${vyos_op_scripts_dir}/show_vpn_ra.py</command>
+              </leafNode>
               <node name="sa">
                 <properties>
                   <help>Show all active IPSec Security Associations (SA)</help>
-- 
cgit v1.2.3


From b4629d14d8ec5c780f665222205a396eb4dc3158 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 14 Aug 2021 18:24:54 +0200
Subject: op-mode: vpn: use  over absolute path

---
 op-mode-definitions/vpn-ipsec.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'op-mode-definitions/vpn-ipsec.xml.in')

diff --git a/op-mode-definitions/vpn-ipsec.xml.in b/op-mode-definitions/vpn-ipsec.xml.in
index 18b72b87c..3d997c143 100644
--- a/op-mode-definitions/vpn-ipsec.xml.in
+++ b/op-mode-definitions/vpn-ipsec.xml.in
@@ -184,7 +184,7 @@
                     <command>if pgrep charon >/dev/null ; then sudo /usr/sbin/ipsec statusall ; else echo "IPSec process not running" ; fi</command>
                   </node>
                 </children>
-                <command>if pgrep charon >/dev/null ; then sudo /usr/libexec/vyos/op_mode/show_ipsec_sa.py ; else echo "IPSec process not running" ; fi</command>
+                <command>if pgrep charon >/dev/null ; then sudo ${vyos_op_scripts_dir}/show_ipsec_sa.py ; else echo "IPSec process not running" ; fi</command>
               </node>
               <node name="state">
                 <properties>
-- 
cgit v1.2.3