collect backup client list in a plain text file

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 2918a79..f8f83f2 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -51,23 +51,24 @@ class bacula::client inherits bacula {
                notify  => Service['bacula-fd'],
        }
        if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
-               file { '/etc/systemd/system/bacula-fd.service.d':
-                       ensure  => directory,
-                       mode    => '0755',
-                       owner   => root,
-                       group   => root,
-               }
+               # 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':
@@ -81,4 +82,12 @@ class bacula::client inherits bacula {
        #       description => 'Allow bacula access from storage and director',
        #       rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip6}) ACCEPT",
        #}
+
+       @@concat::fragment { "bacula-dsa-client-list::$fqdn":
+               target => $bacula::bacula_dsa_client_list ,
+               content  => @("EOF"),
+                               ${fqdn}
+                               | EOF
+               tag     => $bacula::tag_bacula_dsa_client_list,
+       }
 }