Only sync logs once per day since we are only transferring rotated logs

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 8b2bb4e098ac8754c0eeb2cdcb86a9471878549c..1ff49df9c253d43be6c78eab9a480ed5b47bca21 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,7 +1,7 @@
 class bacula::client inherits bacula {
        @@bacula::storage-per-node { $::fqdn: }
 
-       if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, kaufmann, lully, master, new-master, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
+       if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
                @@bacula::node { $::fqdn: }
        }
 
@@ -18,9 +18,9 @@ class bacula::client inherits bacula {
 
        exec { 'bacula-fd restart-when-idle':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-               command     => '(setsid /usr/local/sbin/bacula-idle-restart fd &)',
+               command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
                refreshonly => true,
-               subscribe   => File['/etc/ssl/debian/certs/thishost.crt'],
+               subscribe   => [ File[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
                require     => File['/usr/local/sbin/bacula-idle-restart'],
        }
 
@@ -30,7 +30,11 @@ class bacula::client inherits bacula {
                owner   => root,
                group   => bacula,
                require => Package['bacula-fd'],
-               notify  => Service['bacula-fd'],
+               notify  => Exec['bacula-fd restart-when-idle'],
+       }
+       file { '/usr/local/sbin/bacula-backup-dirs':
+               mode    => '0775',
+               source  => 'puppet:///modules/bacula/bacula-backup-dirs',
        }
        file { '/usr/local/sbin/postbaculajob':
                mode    => '0775',