From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 16 Jun 2012 10:35:43 +0000 (+0200)
Subject: And a bit more stable keys, as well as limiting the access to the director a bit
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dd9a942af75b2283d353169d48764a16b75fb96c;p=mirror%2Fdsa-puppet.git

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 b998de2eb..9dde19d26 100644
--- 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;