remove unnecessary fileserver variable (#2460)

diff --git a/manifests/base.pp b/manifests/base.pp
index 03c507177eddaaec44808b269f47ef35c1b13286..84062ebe3fee86bd133e6aa9bc6a30c7d7636be4 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -11,9 +11,9 @@ class lighttpd::base {
     }
 
     file{'/etc/lighttpd/lighttpd.conf':
-        source => [ "puppet://$server/modules/site-lighttpd/${fqdn}/lighttpd.conf",
-                    "puppet://$server/modules/site-lighttpd/lighttpd.conf",
-                    "puppet://$server/modules/lighttpd/lighttpd.conf" ],
+        source => [ "puppet:///modules/site-lighttpd/${fqdn}/lighttpd.conf",
+                    "puppet:///modules/site-lighttpd/lighttpd.conf",
+                    "puppet:///modules/lighttpd/lighttpd.conf" ],
         require => Package['lighttpd'],
         notify => Service['lighttpd'],
         owner => root, group => 0, mode => 0644;

diff --git a/manifests/config/file.pp b/manifests/config/file.pp
index 6fa98c42831a13ffbec3800cc8e5fd29bbd35143..af6580f6d2223b04594b02e925bd4db495fc9cab 100644 (file)
--- a/manifests/config/file.pp
+++ b/manifests/config/file.pp
@@ -14,17 +14,17 @@ define lighttpd::config::file(
             File["/etc/lighttpd/conf.d/${name}.conf"]{
                 source => $conf_source ? {
                   'absent'  => [
-                    "puppet://$server/modules/site-lighttpd/conf.d/$fqdn/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/conf.d/$lighttpd_cluster_node/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/conf.d/$operatingsystem/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/conf.d/$name.conf",
-                    "puppet://$server/modules/lighttpd/conf.d/$name.conf",
-                    "puppet://$server/modules/lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/modules/lighttpd/conf.d/$operatingsystem/$name.conf",
-                    "puppet://$server/modules/lighttpd/conf.d/$name.conf"
+                    "puppet:///modules/site-lighttpd/conf.d/$fqdn/$name.conf",
+                    "puppet:///modules/site-lighttpd/conf.d/$lighttpd_cluster_node/$name.conf",
+                    "puppet:///modules/site-lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/site-lighttpd/conf.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/site-lighttpd/conf.d/$name.conf",
+                    "puppet:///modules/lighttpd/conf.d/$name.conf",
+                    "puppet:///modules/lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/lighttpd/conf.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/lighttpd/conf.d/$name.conf"
                   ],
-                  default => "puppet://$server/$conf_source",
+                  default => "puppet:///$conf_source",
               }
             }
         }

diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp
index f047173a391bf77a547dc7fa706810143ed1f7cc..054a530497b315edaa954e846aa1e23af773b2ca 100644 (file)
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -15,16 +15,16 @@ define lighttpd::vhost::file(
             File["/etc/lighttpd/vhosts.d/${name}.conf"]{
                 source => $vhost_source ? {
                   'absent'  => [
-                    "puppet://$server/modules/site-lighttpd/vhosts.d/$fqdn/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/vhosts.d/$lighttpd_cluster_node/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/modules/site-lighttpd/vhosts.d/$name.conf",
-                    "puppet://$server/modules/lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/modules/lighttpd/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/modules/lighttpd/vhosts.d/$name.conf"
+                    "puppet:///modules/site-lighttpd/vhosts.d/$fqdn/$name.conf",
+                    "puppet:///modules/site-lighttpd/vhosts.d/$lighttpd_cluster_node/$name.conf",
+                    "puppet:///modules/site-lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/site-lighttpd/vhosts.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/site-lighttpd/vhosts.d/$name.conf",
+                    "puppet:///modules/lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/lighttpd/vhosts.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/lighttpd/vhosts.d/$name.conf"
                   ],
-                  default => "puppet://$server/$vhost_source",
+                  default => "puppet:///$vhost_source",
               }
             }
         }

diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
index 9e026617a61480806914abeb976143cc8e11f627..72cbcf511616b074e060dba85a7f8ab2a0d5d21b 100644 (file)
--- a/manifests/vhosts.pp
+++ b/manifests/vhosts.pp
@@ -1,6 +1,6 @@
 class lighttpd::vhosts {
   file{'/etc/lighttpd/vhosts.d':
-    source => "puppet://$server/modules/common/empty",
+    source => "puppet:///modules/common/empty",
     ensure => directory,
     purge => true,
     recurse => true,