From 9b993d7a97361a5044e896e7cdf6ad22a1d05870 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 12:26:34 +0000
Subject: unified fileserver location, in the future the fileserver should only
 be accessed by $server

git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1251 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/init.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 04b06bb..5813a3c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -73,11 +73,11 @@ class shorewall {
 		}
 		file {
 			"${dir}/000-header":
-				source => "puppet://$servername/shorewall/boilerplate/${name}.header",
+				source => "puppet://$server/shorewall/boilerplate/${name}.header",
 				mode => 0600, owner => root, group => 0,
 				notify => Exec["concat_${dir}"];
 			"${dir}/999-footer":
-				source => "puppet://$servername/shorewall/boilerplate/${name}.footer",
+				source => "puppet://$server/shorewall/boilerplate/${name}.footer",
 				mode => 0600, owner => root, group => 0,
 				notify => Exec["concat_${dir}"];
 		}
@@ -98,9 +98,9 @@ class shorewall {
 	file { "/etc/shorewall/shorewall.conf":
 		# use OS specific defaults, but use Default if no other is found
 		source => [
-			"puppet://$servername/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
-			"puppet://$servername/shorewall/shorewall.conf.$operatingsystem",
-			"puppet://$servername/shorewall/shorewall.conf.Default"
+			"puppet://$server/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+			"puppet://$server/shorewall/shorewall.conf.$operatingsystem",
+			"puppet://$server/shorewall/shorewall.conf.Default"
             ],
 		mode => 0644, owner => root, group => 0,
         notify => Service[shorewall],
-- 
cgit v1.2.3