Use more stable secrets for director and storage

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index 3cf9b6742f335ab0a0a7d0e5fc536af1f010038c..b998de2eb3ea36670635ee84f03428ffe4de25f7 100644 (file)
--- a/modules/bacula/manifests/bacula.pp
+++ b/modules/bacula/manifests/bacula.pp
@@ -20,9 +20,9 @@ class bacula {
 
   $bacula_backup_path       = "/srv/backup.debian.org/bacula"
 
-  $bacula_director_secret   = hmac("/etc/puppet/secret", "bacula-dir-$hostname")
+  $bacula_director_secret   = hmac("/etc/puppet/secret", "bacula-dir-$bacula_director_name")
   $bacula_db_secret         = hmac("/etc/puppet/secret", "bacula-db-$hostname")
-  $bacula_storage_secret    = hmac("/etc/puppet/secret", "bacula-sd-$hostname")
+  $bacula_storage_secret    = hmac("/etc/puppet/secret", "bacula-sd-$bacula_storage_name")
   $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$hostname")
   $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$hostname")