Move crontab bacula-director into dsa-puppet-stuff

[mirror/dsa-puppet.git] / modules / bacula / manifests / client.pp

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 66c4326..d016e0d 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,5 +1,5 @@
 class bacula::client inherits bacula {
-       @@bacula::storage-per-node { $::fqdn: }
+       @@bacula::storage_per_node { $::fqdn: }
 
        if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
                @@bacula::node { $::fqdn:
@@ -50,24 +50,25 @@ class bacula::client inherits bacula {
                require => Package['bacula-fd'],
                notify  => Service['bacula-fd'],
        }
-       if $::lsbmajdistrelease >= 9 {
-               file { '/etc/systemd/system/bacula-fd.service.d':
-                       ensure  => directory,
-                       mode    => '0755',
-                       owner   => root,
-                       group   => root,
-               }
+       if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+               # old name for the override content
                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'],
+                       ensure  => absent,
+               }
+               systemd::override { 'bacula-fd':
+                       content => @(EOT)
+                               [Service]
+                               ExecStart=
+                               ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+                               | EOT
                }
        } else {
                file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
                        ensure  => absent,
                }
+               systemd::override { 'bacula-fd':
+                       ensure  => absent,
+               }
        }
 
        @ferm::rule { 'dsa-bacula-fd-v4':