From 993902afaabd8e7eb7823ecb4ae5ae730104f64f Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 29 Jan 2017 18:45:45 +0100 Subject: [PATCH] Only set ExecStart command for bacula-fd on stretch On jessie let the init script + /etc/default file handle things. --- modules/bacula/manifests/client.pp | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp index 81db8712c..66c432671 100644 --- a/modules/bacula/manifests/client.pp +++ b/modules/bacula/manifests/client.pp @@ -50,18 +50,24 @@ class bacula::client inherits bacula { require => Package['bacula-fd'], notify => Service['bacula-fd'], } - file { '/etc/systemd/system/bacula-fd.service.d': - ensure => directory, - mode => '0755', - owner => root, - group => root, - } - file { '/etc/systemd/system/bacula-fd.service.d/user.conf': - source => 'puppet:///modules/bacula/bacula-fd-systemd', - mode => '0400', - owner => root, - group => root, - notify => Exec['systemctl daemon-reload'], + if $::lsbmajdistrelease >= 9 { + file { '/etc/systemd/system/bacula-fd.service.d': + ensure => directory, + mode => '0755', + owner => root, + group => root, + } + file { '/etc/systemd/system/bacula-fd.service.d/user.conf': + source => 'puppet:///modules/bacula/bacula-fd-systemd', + mode => '0400', + owner => root, + group => root, + notify => Exec['systemctl daemon-reload'], + } + } else { + file { '/etc/systemd/system/bacula-fd.service.d/user.conf': + ensure => absent, + } } @ferm::rule { 'dsa-bacula-fd-v4': -- 2.20.1