puppet 4 foo

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index a2f818e..05234fc 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,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  => Service['bacula-fd'],
+       if ($::lsbmajdistrelease >= '9' and $systemd) {
+               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':