X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=3505300c128fa56af91793a0f9c84be22ff637f2;hb=02c4cbe3e1477139f9bec26ef8a0a90b0ff3529f;hp=9ac5acb4ef9942d1afa463cfa27e59dc7a4720fd;hpb=973f873a452fdba7a8628d3dc646ab1e5b82e8bd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 9ac5acb4e..3505300c1 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -3,38 +3,49 @@
 # this mostly configures the file daemon, but also firewall rules and
 # fragments to sent to the other servers.
 #
-# @param director_server The director server that controls this client's backups
-# @param storage_server The storage server to use for this client
-# @param port_fd Port that bacula-fd listens on
-# @param ensure  present or absent
+# @param director_server  director server (address) that controls this client's backups
+# @param storage_server   storage server (address) to use for this client
+# @param port_fd          port that bacula-fd listens on
+# @param client_name      bacula client name for this instance
+# @param ensure           present or absent
 class bacula::client(
-  String $director_server,
-  String $storage_server,
+  Stdlib::Host $director_server,
+  Stdlib::Host $storage_server,
   Integer $port_fd = 9102,
+  String $client_name = "${::fqdn}-fd",
   Enum['present', 'absent'] $ensure = defined(Class['bacula::not_a_client']) ? { true => 'absent', default => 'present' },
 ) inherits bacula {
   $package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
   $service_ensure = $ensure ? { 'present' => 'running', 'absent'  => 'stopped' }
   $service_enable = $ensure ? { 'present' => true, 'absent' => false }
   $reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
+  $directory_ensure = $ensure ? { 'present' => 'directory', 'absent' => 'absent' }
+
+  $client = $::fqdn
+
+  file { '/etc/bacula/fd-conf.d':
+    ensure  => $directory_ensure,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    notify  => Exec['bacula-fd restart-when-idle'],
+  }
 
   if $ensure == 'present' {
-    @@bacula::director::client { $::fqdn:
-      port_fd => $port_fd,
-      client          => $::fqdn,
-      tag     => "bacula::to-director::${director_server}",
-    }
+    Bacula::Client::Director <<| tag == "bacula::to-fd::${director_server}" |>>
 
-    @@bacula::storage::client { $::fqdn:
+    @@bacula::storage::client { $client:
       tag             => "bacula::to-storage::${storage_server}",
-      client          => $::fqdn,
+      client          => $client,
       director_server => $director_server,
     }
 
-    @@concat::fragment { "bacula-dsa-client-list::${::fqdn}":
+    @@concat::fragment { "bacula-dsa-client-list::${client}":
       target  => $bacula::bacula_dsa_client_list ,
       content => @("EOF"),
-          ${::fqdn}
+          ${client}
           | EOF
       tag     => $bacula::tag_bacula_dsa_client_list,
     }
@@ -45,7 +56,7 @@ class bacula::client(
     }
 
     # get access to the storage
-    @@ferm::rule::simple { "bacula::fd-to-storage::${::fqdn}":
+    @@ferm::rule::simple { "bacula::fd-to-storage::${client}":
       tag         => "bacula::fd-to-storage::${storage_server}",
       description => 'Allow bacula-fd access to the bacula-storage',
       chain       => 'bacula-sd',
@@ -71,7 +82,6 @@ class bacula::client(
     ensure    => $service_ensure,
     enable    => $service_enable,
     hasstatus => true,
-    require   => Package['bacula-fd']
   }
 
   exec { 'bacula-fd restart-when-idle':
@@ -79,7 +89,7 @@ class bacula::client(
     command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'",
     refreshonly => true,
     subscribe   => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
-    require     => File['/usr/local/sbin/bacula-idle-restart'],
+    require     => [ File['/usr/local/sbin/bacula-idle-restart'], File['/etc/bacula/fd-conf.d/empty.conf'] ],
   }
 
   file { '/etc/bacula/bacula-fd.conf':
@@ -88,7 +98,13 @@ class bacula::client(
     mode    => '0640',
     owner   => root,
     group   => bacula,
-    require => Package['bacula-fd'],
+    notify  => Exec['bacula-fd restart-when-idle'],
+  }
+  file { '/etc/bacula/fd-conf.d/empty.conf':
+    ensure  => $ensure,
+    content => '',
+    mode    => '0440',
+    group   => bacula,
     notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
@@ -107,7 +123,6 @@ class bacula::client(
     mode    => '0400',
     owner   => root,
     group   => root,
-    require => Package['bacula-fd'],
     notify  => Service['bacula-fd'],
   }
   if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $facts['systemd']) {