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 8cf215b..05234fc 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,8 +1,10 @@
 class bacula::client inherits bacula {
-       @@bacula::storage-per-node { $::fqdn: }
+       @@bacula::storage_per_node { $::fqdn: }
 
-       if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, lully, master, new-master, schumann, soler, widor, wilder, wolkenstein] {
-               @@bacula::node { $::fqdn: }
+       if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
+               @@bacula::node { $::fqdn:
+                       bacula_client_port => $bacula::bacula_client_port,
+               }
        }
 
        package { ['bacula-fd']:
@@ -16,40 +18,62 @@ 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':
-                       content => template('bacula/apt.preferences.bacula-client.erb'),
-                       mode    => '0444',
-                       owner   => root,
-                       group   => root,
-                       ;
+       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 >= '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':
                domain      => '(ip)',
                description => 'Allow bacula access from storage and director',
-               rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip}) ACCEPT",
+               rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip}) ACCEPT",
        }
 
        #@ferm::rule { 'dsa-bacula-fd-v6':