From 43124b2481a8c37221a25b9cbc633433bb30b0b0 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 18 Apr 2016 15:18:13 +0200
Subject: assume systemd is always present now

---
 .../site_openvpn/manifests/server_config.pp        | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 15e6fb38..f33ab17c 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -209,20 +209,15 @@ define site_openvpn::server_config(
       server => $openvpn_configname;
   }
 
-  # register openvpn services at systemd on nodes newer than wheezy
+  # register openvpn services at systemd
   # see https://leap.se/code/issues/7798
-  case $::operatingsystemrelease {
-    /^7.*/: { }
-    default:  {
-      exec { "enable_systemd_${openvpn_configname}":
-        refreshonly => true,
-        command     => "/bin/systemctl enable openvpn@${openvpn_configname}",
-        subscribe   => File["/etc/openvpn/${openvpn_configname}.conf"],
-        notify      => Service["openvpn@${openvpn_configname}"];
-      }
-      service { "openvpn@${openvpn_configname}":
-        ensure  => running
-      }
-    }
+  exec { "enable_systemd_${openvpn_configname}":
+    refreshonly => true,
+    command     => "/bin/systemctl enable openvpn@${openvpn_configname}",
+    subscribe   => File["/etc/openvpn/${openvpn_configname}.conf"],
+    notify      => Service["openvpn@${openvpn_configname}"];
+  }
+  service { "openvpn@${openvpn_configname}":
+    ensure  => running
   }
 }
-- 
cgit v1.2.3