soler: decomission rt#5890

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index b6f03723f4b3c9c2164747fa824f492e02618aa1..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, schumann, soler, widor, wilder, wolkenstein] {
+       if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
                @@bacula::node { $::fqdn: }
        }
 
@@ -16,34 +16,49 @@ class bacula::client inherits bacula {
                require   => Package['bacula-fd']
        }
 
-       file {
-               '/etc/bacula/bacula-fd.conf':
-                       content => template('bacula/bacula-fd.conf.erb'),
-                       mode    => '0640',
-                       owner   => root,
-                       group   => bacula,
-                       require => Package['bacula-fd'],
-                       notify  => Service['bacula-fd'],
-                       ;
-               '/usr/local/sbin/postbaculajob':
-                       mode    => '0775',
-                       source  => 'puppet:///modules/bacula/postbaculajob',
-                       ;
-               '/etc/default/bacula-fd':
-                       content => template('bacula/default.bacula-fd.erb'),
-                       mode    => '0400',
-                       owner   => root,
-                       group   => root,
-                       require => Package['bacula-fd'],
-                       notify  => Service['bacula-fd'],
-                       ;
-               '/etc/apt/preferences.d/dsa-bacula-client':
+       exec { 'bacula-fd restart-when-idle':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
+               refreshonly => true,
+               subscribe   => [ File[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
+               require     => File['/usr/local/sbin/bacula-idle-restart'],
+       }
+
+       file { '/etc/bacula/bacula-fd.conf':
+               content => template('bacula/bacula-fd.conf.erb'),
+               mode    => '0640',
+               owner   => root,
+               group   => bacula,
+               require => Package['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',
+               source  => 'puppet:///modules/bacula/postbaculajob',
+       }
+       file { '/etc/default/bacula-fd':
+               content => template('bacula/default.bacula-fd.erb'),
+               mode    => '0400',
+               owner   => root,
+               group   => root,
+               require => Package['bacula-fd'],
+               notify  => Service['bacula-fd'],
+       }
+       if $::lsbmajdistrelease < 7 {
+               file { '/etc/apt/preferences.d/dsa-bacula-client':
                        content => template('bacula/apt.preferences.bacula-client.erb'),
                        mode    => '0444',
                        owner   => root,
                        group   => root,
-                       ;
-
+               }
+       } else {
+               file { '/etc/apt/preferences.d/dsa-bacula-client':
+                       ensure => absent
+               }
        }
 
        @ferm::rule { 'dsa-bacula-fd-v4':