From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 16 Jun 2012 10:31:05 +0000 (+0200)
Subject: Use more stable secrets for director and storage
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bed86f6f88912daeffb381f81365b1fa7d9f75dc;hp=a16bb393beb587ffdfc951f48192c2cfe73d9bce;p=dsa-puppet.git

Use more stable secrets for director and storage
---

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index 3cf9b674..b998de2e 100644
--- 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")