diff options
author | varac <varacanero@zeromail.org> | 2015-11-28 14:06:13 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-11-28 21:31:18 +0100 |
commit | 7db6ced463338796771d05cdac54c24731ae936f (patch) | |
tree | 18378c5696a364b6e2333d059d8c2cb471ea6b49 /puppet/modules/site_nickserver/manifests | |
parent | c775799b7aff2417d0032f26ee2d598c764beed3 (diff) |
[bug] [jessie] register nickserver at systemd
- resolves #7614
Diffstat (limited to 'puppet/modules/site_nickserver/manifests')
-rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 15 |
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'] ]; |