From b7bc2437a32b4c214369e2cb6bc0006ca6363c6e Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Thu, 15 Mar 2018 19:02:29 +0100
Subject: Imported some more openvpn tunnels

---
 services/applications/openvpn.cf | 8 ++------
 services/main.cf                 | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'services')

diff --git a/services/applications/openvpn.cf b/services/applications/openvpn.cf
index 597318f..963c720 100644
--- a/services/applications/openvpn.cf
+++ b/services/applications/openvpn.cf
@@ -3,9 +3,6 @@ bundle agent openvpn
     vars:
         any::
             "tunnels" slist => getindices("g.host_data[tunnels]");
-    classes:
-        any::
-            "$(tunnels)_needs_restart" or => { "openvpn_common_key_repaired", "linux.openvpn_$(tunnels)_conf_repaired" };
     files:
         any::
             "/etc/openvpn/common.key"
@@ -25,7 +22,7 @@ bundle agent openvpn
                 classes => if_repaired("tunnel_$(tunnels)_service_repaired");
     commands:
         any::
-            "/usr/sbin/service openvpn@$(tunnels) restart" classes => if_repaired("tunnel_$(tunnels)_service_repaired"), ifvarclass => "$(tunnels)_needs_restart";
+            "/usr/sbin/service openvpn@$(tunnels) restart" classes => if_repaired("tunnel_$(tunnels)_service_repaired"), ifvarclass => "openvpn_common_key_repaired";
     reports:
         any::
             "$(this.bundle): common.key repaired" ifvarclass => "openvpn_common_key_repaired";
@@ -36,7 +33,6 @@ bundle agent openvpn_tunnel(tunnel)
 {
     classes:
         any::
-            "$(tunnel)_needs_restart" or => { "openvpn_common_key_repaired", "linux.openvpn_$(tunnel)_conf_repaired" };
             "has_remote" and => { isvariable("g.host_data[tunnels][$(tunnel)][remote_host]"), isvariable("g.host_data[tunnels][$(tunnel)][remote_port]") };
     files:
         any::
@@ -49,7 +45,7 @@ bundle agent openvpn_tunnel(tunnel)
                 classes => if_repaired("openvpn_$(tunnel)_conf_repaired");
     commands:
         any::
-            "/usr/sbin/service openvpn@$(tunnel) restart" classes => if_repaired("tunnel_$(tunnel)_service_repaired"), ifvarclass => "$(tunnel)_needs_restart";
+            "/usr/sbin/service openvpn@$(tunnel) restart" classes => if_repaired("tunnel_$(tunnel)_service_repaired"), ifvarclass => "openvpn_$(tunnel)_conf_repaired";
     reports:
         any::
             "$(this.bundle): $(tunnel).conf repaired" ifvarclass => "openvpn_$(tunnel)_conf_repaired";
diff --git a/services/main.cf b/services/main.cf
index 0d4270f..31e20d5 100644
--- a/services/main.cf
+++ b/services/main.cf
@@ -57,7 +57,7 @@ bundle common g
 bundle agent main
 {
     methods:
-        andromeda|collab_jde::
+        linux.!containers::
             "andromeda" usebundle => openvpn;
         nagios::
             "nagios"  usebundle => nagios;
-- 
cgit v1.2.3