From a526f7e1c2d30c1cd7e075a23808d9003ac38089 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 25 Sep 2019 11:19:18 +0200 Subject: [PATCH] All our systems are now at least Debian 9 --- modules/bacula/manifests/client.pp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp index 3837699a2..dbd8d44ab 100644 --- a/modules/bacula/manifests/client.pp +++ b/modules/bacula/manifests/client.pp @@ -90,6 +90,9 @@ class bacula::client( content => @(EOF), [Unit] After=network-online.target + [Service] + ExecStart= + ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k | EOF } @@ -134,17 +137,4 @@ class bacula::client( group => root, notify => Service['bacula-fd'], } - if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $facts['systemd']) { - dsa_systemd::override { 'bacula-fd': - content => @(EOT) - [Service] - ExecStart= - ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k - | EOT - } - } else { - dsa_systemd::override { 'bacula-fd': - ensure => absent, - } - } } -- 2.20.1