X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fbacula.pp;h=6643e0996b638d1fe023d856586575146f97363b;hb=98293f6fb4e156b3c2f42024adec5d332c056bcf;hp=9dde19d2627b59c49b9b5e024ea678f635aa85ce;hpb=dd9a942af75b2283d353169d48764a16b75fb96c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index 9dde19d26..6643e0996 100644
--- a/modules/bacula/manifests/bacula.pp
+++ b/modules/bacula/manifests/bacula.pp
@@ -4,7 +4,7 @@ class bacula {
 
   $bacula_director_name     = "debian-dir"
   $bacula_storage_name      = "debian-sd"
-  $bacula_client_name       = "$hostname-fd"
+  $bacula_client_name       = "$fqdn-fd"
   $bacula_monitor_name      = "debian-mon"
   $bacula_filestor_name     = "File"
   $bacula_filestor_device   = "FileStorage"
@@ -18,12 +18,12 @@ class bacula {
   $bacula_db_address        = "danzi.debian.org"
   $bacula_db_port           = 5433
 
-  $bacula_backup_path       = "/srv/backup.debian.org/bacula"
+  $bacula_backup_path       = "/srv/bacula"
 
   $bacula_director_secret   = hmac("/etc/puppet/secret", "bacula-dir-$hostname")
   $bacula_db_secret         = hmac("/etc/puppet/secret", "bacula-db-$hostname")
   $bacula_storage_secret    = hmac("/etc/puppet/secret", "bacula-sd-$bacula_storage_name")
-  $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$hostname")
+  $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$fqdn")
   $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$bacula_director_name")
 
   package {