2 files changed, 10 insertions, 15 deletions
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index f1ecefb9..ee7d6840 100644
--- a/puppet/modules/site_openvpn/manifests/init.pp
+++ b/puppet/modules/site_openvpn/manifests/init.pp
@@ -68,7 +68,7 @@ class site_openvpn {
   # find out the netmask in cidr format of the primary IF
   # thx to https://blog.kumina.nl/tag/puppet-tips-and-tricks/
   # we can do this using an inline_template:
-  $factname_primary_netmask = "netmask_cidr_${::site_config::params::interface}"
+  $factname_primary_netmask = "netmask_${::site_config::params::interface}"
   $primary_netmask = inline_template('<%= scope.lookupvar(@factname_primary_netmask) %>')
 
   # deploy dh keys
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
   }
 }