summaryrefslogtreecommitdiff
path: root/puppet/modules/site_openvpn/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-04-18 15:18:13 +0200
committervarac <varacanero@zeromail.org>2017-02-23 10:56:21 +0100
commit43124b2481a8c37221a25b9cbc633433bb30b0b0 (patch)
treecf339774ab3721d7f2cbc1b8a1cad3ad62e16ced /puppet/modules/site_openvpn/manifests
parent61b0127cb0357e187a930cba1cc0e1ace149ed55 (diff)
assume systemd is always present now
Diffstat (limited to 'puppet/modules/site_openvpn/manifests')
-rw-r--r--puppet/modules/site_openvpn/manifests/server_config.pp23
1 files 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
}
}