From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 24 Jun 2012 11:39:08 +0000 (+0200)
Subject: Use ${} rather than $ for variable interpolation
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=77b637be76b0882c0e83104eefdc6a97fcad9037;p=mirror%2Fdsa-puppet.git

Use ${} rather than $ for variable interpolation
---

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index 6643e0996..5750f739f 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       = "$fqdn-fd"
+  $bacula_client_name       = "${fqdn}-fd"
   $bacula_monitor_name      = "debian-mon"
   $bacula_filestor_name     = "File"
   $bacula_filestor_device   = "FileStorage"
@@ -20,11 +20,11 @@ class 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-$fqdn")
-  $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$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-${fqdn}")
+  $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-${bacula_director_name}")
 
   package {
     "bacula-console": ensure => installed;