From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 24 Jun 2012 11:46:58 +0000 (+0200)
Subject: String interpolation
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=3d0358a63f806461cdf786cbcc6b34b0ee23d681;p=dsa-puppet.git

String interpolation
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index baf00406..f9f11329 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -33,12 +33,12 @@ class bacula::client inherits bacula {
   @ferm::rule { 'dsa-bacula-fd-v4':
     domain      => '(ip)',
     description => 'Allow bacula access from storage and director',
-    rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr ($bacula_director_address) ACCEPT",
+    rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_address}) ACCEPT",
   }
 
   @ferm::rule { 'dsa-bacula-fd-v6':
     domain      => '(ip6)',
     description => 'Allow bacula access from storage and director',
-    rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr ($bacula_director_address) ACCEPT",
+    rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_address}) ACCEPT",
   }
 }
diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index c60e8b2e..58c143d2 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -58,7 +58,7 @@ class bacula::director inherits bacula {
   @ferm::rule { 'dsa-bacula-dir':
     domain      => '(ip ip6)',
     description => 'Allow bacula access from localhost',
-    rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr ($bacula_director_address localhost) ACCEPT",
+    rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
   }
 
 }