X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=40720b7496c7ff8f05fd2e99354fed44ab4d5f6b;hb=a16bb393beb587ffdfc951f48192c2cfe73d9bce;hp=3bb019764887248114775d5740c3db601c896cbe;hpb=8fc104f1c82d84fb71ed3f3b5e8ac7708dea6d86;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 3bb019764..40720b749 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -21,7 +21,7 @@ class bacula::director inherits bacula {
       notify  => Exec["bacula-director restart"]
       ;
     "/etc/bacula/bacula-dir.conf":
-      content => template("bacula/etc/bacula/bacula-dir.conf.erb"),
+      content => template("bacula/bacula-dir.conf.erb"),
       mode => 440,
       group => bacula,
       require => Package["bacula-director-pgsql"],
@@ -34,4 +34,23 @@ class bacula::director inherits bacula {
       path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
       refreshonly => true;
   }
+
+  define bacula_client() {
+    # These must be kept in sync with the settings in bacula.pp
+    $bacula_client_name       = "${name}-fd"
+    $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-${name}")
+    $client = $name
+
+    file {
+      "/etc/bacula/conf.d/${name}.conf":
+      content => template("bacula/per-client.conf.erb"),
+      mode => 440,
+      group => bacula,
+      notify  => Exec["bacula-director restart"]
+      ;
+    }
+  }
+  $allhosts = keys($site::allnodeinfo)
+
+  bacula_client { $allhosts: }
 }