summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-01 11:15:13 +0100
committervarac <varacanero@zeromail.org>2015-12-01 11:15:13 +0100
commitd0e3e1d596a536da0a1729519cfd561ee19e2ce8 (patch)
treefe699825664f96f3ad593183502c00947e762d83 /puppet
parentc7dff6fbcd368c126fa03d8bb8b3e32e20b7dbc7 (diff)
parent7db6ced463338796771d05cdac54c24731ae936f (diff)
Merge branch 'nickserver_jessie' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_nickserver/manifests/init.pp15
1 files changed, 15 insertions, 0 deletions
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp
index c2deab0f..47df0946 100644
--- a/puppet/modules/site_nickserver/manifests/init.pp
+++ b/puppet/modules/site_nickserver/manifests/init.pp
@@ -122,6 +122,19 @@ class site_nickserver {
require => Vcsrepo['/srv/leap/nickserver'];
}
+ # register initscript at systemd on nodes newer than wheezy
+ # see https://leap.se/code/issues/7614
+ case $::operatingsystemrelease {
+ /^7.*/: { }
+ default: {
+ exec { 'register_systemd_nickserver':
+ refreshonly => true,
+ command => '/bin/systemctl enable nickserver',
+ subscribe => File['/etc/init.d/nickserver'];
+ }
+ }
+ }
+
service { 'nickserver':
ensure => running,
enable => true,
@@ -129,6 +142,8 @@ class site_nickserver {
hasstatus => true,
require => [
File['/etc/init.d/nickserver'],
+ File['/usr/bin/nickserver'],
+ Exec['register_systemd_nickserver'],
Class['Site_config::X509::Key'],
Class['Site_config::X509::Cert'],
Class['Site_config::X509::Ca'] ];