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

---
 manifests/centos/itk.pp    |  6 +++---
 manifests/centos/module.pp | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests/centos')

diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp
index 94f0f1c..46a5225 100644
--- a/manifests/centos/itk.pp
+++ b/manifests/centos/itk.pp
@@ -5,8 +5,8 @@ class apache::centos::itk inherits apache::centos {
         name => 'httpd-itk',
     }
     File['apache_service_config']{
-      source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd.itk",
-                  "puppet://$server/modules/site-apache/service/CentOS/httpd.itk",
-                  "puppet://$server/modules/apache/service/CentOS/httpd.itk" ],
+      source => [ "puppet:///modules/site-apache/service/CentOS/${fqdn}/httpd.itk",
+                  "puppet:///modules/site-apache/service/CentOS/httpd.itk",
+                  "puppet:///modules/apache/service/CentOS/httpd.itk" ],
     }
 }
diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp
index 4bbf251..b4cddb7 100644
--- a/manifests/centos/module.pp
+++ b/manifests/centos/module.pp
@@ -10,13 +10,13 @@ define apache::centos::module(
     }
     $real_source = $source ? {
         ''  => [
-            "puppet://$server/modules/site-apache/modules.d/${fqdn}/${name}.so",
-            "puppet://$server/modules/site-apache/modules.d/${apache_cluster_node}/${name}.so",
-            "puppet://$server/modules/site-apache/modules.d/${name}.so",
-            "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.so",
-            "puppet://$server/modules/apache/modules.d/${name}.so"
+            "puppet:///modules/site-apache/modules.d/${fqdn}/${name}.so",
+            "puppet:///modules/site-apache/modules.d/${apache_cluster_node}/${name}.so",
+            "puppet:///modules/site-apache/modules.d/${name}.so",
+            "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.so",
+            "puppet:///modules/apache/modules.d/${name}.so"
         ],
-        default => "puppet://$server/$source",
+        default => "puppet:///$source",
     }
     file{"modules_${name}.conf":
         ensure => $ensure,
-- 
cgit v1.2.3