]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Use ${} rather than $ for variable interpolation
authorTollef Fog Heen <tfheen@err.no>
Sun, 24 Jun 2012 11:39:08 +0000 (13:39 +0200)
committerTollef Fog Heen <tfheen@err.no>
Sun, 24 Jun 2012 11:39:39 +0000 (13:39 +0200)
modules/bacula/manifests/bacula.pp

index 6643e0996b638d1fe023d856586575146f97363b..5750f739f441abe7726cf2c39d642a30bbae123f 100644 (file)
@@ -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;