From f9c1086afb6c343fe65e989413acb80cb7d5cb86 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 7 Aug 2010 02:12:26 +0200
Subject: remove unnecessary fileserver variable (#2460)

---
 manifests/base.pp         | 16 ++++++++--------
 manifests/debian.pp       |  2 +-
 manifests/managed_file.pp |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index 406aa80..e068c35 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -7,14 +7,14 @@ class shorewall::base {
     file { "/etc/shorewall/shorewall.conf":
       # use OS specific defaults, but use Default if no other is found
       source => [
-            "puppet://$server/modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem",
-            "puppet://$server/modules/site-shorewall/${fqdn}/shorewall.conf",
-            "puppet://$server/modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
-            "puppet://$server/modules/site-shorewall/shorewall.conf.$operatingsystem",
-            "puppet://$server/modules/site-shorewall/shorewall.conf",
-            "puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
-            "puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem",
-            "puppet://$server/modules/shorewall/shorewall.conf"
+            "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem",
+            "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf",
+            "puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+            "puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem",
+            "puppet:///modules/site-shorewall/shorewall.conf",
+            "puppet:///modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+            "puppet:///modules/shorewall/shorewall.conf.$operatingsystem",
+            "puppet:///modules/shorewall/shorewall.conf"
         ],
         require => Package[shorewall],
         notify => Service[shorewall],
diff --git a/manifests/debian.pp b/manifests/debian.pp
index dfa890f..eab54a2 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -3,7 +3,7 @@ class shorewall::debian inherits shorewall::base {
       '': { $shorewall_startup = "1" }
     }
     file{'/etc/default/shorewall':
-        #source => "puppet://$server/modules/shorewall/debian/default",
+        #source => "puppet:///modules/shorewall/debian/default",
         content => template("shorewall/debian_default.erb"),
         require => Package['shorewall'],
         notify => Service['shorewall'],
diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp
index 80ffdca..548d6f6 100644
--- a/manifests/managed_file.pp
+++ b/manifests/managed_file.pp
@@ -6,11 +6,11 @@ define shorewall::managed_file () {
     }       
     file {
         "${dir}/000-header":
-            source => "puppet://$server/modules/shorewall/boilerplate/${name}.header",
+            source => "puppet:///modules/shorewall/boilerplate/${name}.header",
             mode => 0600, owner => root, group => 0,
             notify => Exec["concat_${dir}"];
         "${dir}/999-footer":
-            source => "puppet://$server/modules/shorewall/boilerplate/${name}.footer",
+            source => "puppet:///modules/shorewall/boilerplate/${name}.footer",
             mode => 0600, owner => root, group => 0,
             notify => Exec["concat_${dir}"];
     }       
-- 
cgit v1.2.3