And a bit more stable keys, as well as limiting the access to the director a bit

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index b998de2eb3ea36670635ee84f03428ffe4de25f7..9dde19d2627b59c49b9b5e024ea678f635aa85ce 100644 (file)
--- a/modules/bacula/manifests/bacula.pp
+++ b/modules/bacula/manifests/bacula.pp
@@ -20,11 +20,11 @@ class bacula {
 
   $bacula_backup_path       = "/srv/backup.debian.org/bacula"
 
-  $bacula_director_secret   = hmac("/etc/puppet/secret", "bacula-dir-$bacula_director_name")
+  $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_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$hostname")
+  $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$bacula_director_name")
 
   package {
     "bacula-console": ensure => installed;