From f2fad4fa29ff23b2220ba777f54f6be737e051be Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 11 Aug 2010 15:28:58 +0200
Subject: remove unnecessary fileserver variable (#2460) round II

---
 manifests/config/file.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests/config')

diff --git a/manifests/config/file.pp b/manifests/config/file.pp
index d72ba2e..05108ee 100644
--- a/manifests/config/file.pp
+++ b/manifests/config/file.pp
@@ -33,16 +33,16 @@ define apache::config::file(
         'absent': {
             $real_source = $source ? {
                 'absent' => [
-                    "puppet://${server}/modules/site-apache/${confdir}/${fqdn}/${name}",
-                    "puppet://${server}/modules/site-apache/${confdir}/${apache_cluster_node}/${name}",
-                    "puppet://${server}/modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}",
-                    "puppet://${server}/modules/site-apache/${confdir}/${operatingsystem}/${name}",
-                    "puppet://${server}/modules/site-apache/${confdir}/${name}",
-                    "puppet://${server}/modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}",
-                    "puppet://${server}/modules/apache/${confdir}/${operatingsystem}/${name}",
-                    "puppet://${server}/modules/apache/${confdir}/${name}"
+                    "puppet:///modules/site-apache/${confdir}/${fqdn}/${name}",
+                    "puppet:///modules/site-apache/${confdir}/${apache_cluster_node}/${name}",
+                    "puppet:///modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}",
+                    "puppet:///modules/site-apache/${confdir}/${operatingsystem}/${name}",
+                    "puppet:///modules/site-apache/${confdir}/${name}",
+                    "puppet:///modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}",
+                    "puppet:///modules/apache/${confdir}/${operatingsystem}/${name}",
+                    "puppet:///modules/apache/${confdir}/${name}"
                 ],
-                default => "puppet://${server}/${source}",
+                default => "puppet:///${source}",
             }
             File["apache_${name}"]{
                 source => $real_source,
-- 
cgit v1.2.3