remove unnecessary fileserver variable (#2460)

10 files changed, 52 insertions, 52 deletions

diff --git a/manifests/centos.pp b/manifests/centos.pp
index cb47adc..ec29ccb 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -30,9 +30,9 @@ class apache::centos inherits apache::package {
 
     file{'apache_service_config':
         path => '/etc/sysconfig/httpd',
-        source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd",
-                    "puppet://$server/modules/site-apache/service/CentOS/httpd",
-                    "puppet://$server/modules/apache/service/CentOS/httpd" ],
+        source => [ "puppet:///modules/site-apache/service/CentOS/${fqdn}/httpd",
+                    "puppet:///modules/site-apache/service/CentOS/httpd",
+                    "puppet:///modules/apache/service/CentOS/httpd" ],
         require => Package['apache'],
         notify => Service['apache'],
         owner => root, group => 0, mode => 0644;
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,
diff --git a/manifests/debian.pp b/manifests/debian.pp
index e07920f..aa54dfa 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -20,11 +20,11 @@ class apache::debian inherits apache::package {
     }
     file { 'apache_main_config':
         path => "${config_dir}/apache2.conf",
-        source => [ "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf",
-                    "puppet://$server/modules/site-apache/config/Debian/{$fqdn}/apache2.conf",
-                    "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf",
-                    "puppet://$server/modules/site-apache/config/Debian/apache2.conf",
-                    "puppet://$server/modules/apache/config/Debian/apache2.conf" ],
+        source => [ "puppet:///modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf",
+                    "puppet:///modules/site-apache/config/Debian/{$fqdn}/apache2.conf",
+                    "puppet:///modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf",
+                    "puppet:///modules/site-apache/config/Debian/apache2.conf",
+                    "puppet:///modules/apache/config/Debian/apache2.conf" ],
         require => Package['apache'],
         notify => Service['apache'],
         owner => root, group => 0, mode => 0644;
diff --git a/manifests/gentoo/module.pp b/manifests/gentoo/module.pp
index 7764c6f..33b6703 100644
--- a/manifests/gentoo/module.pp
+++ b/manifests/gentoo/module.pp
@@ -10,13 +10,13 @@ define apache::gentoo::module(
     }
     $real_source = $source ? {
         ''  => [
-            "puppet://$server/modules/site-apache/modules.d/${fqdn}/${name}.conf",
-            "puppet://$server/modules/site-apache/modules.d/${apache_cluster_node}/${name}.conf",
-            "puppet://$server/modules/site-apache/modules.d/${name}.conf",
-            "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.conf",
-            "puppet://$server/modules/apache/modules.d/${name}.conf"
+            "puppet:///modules/site-apache/modules.d/${fqdn}/${name}.conf",
+            "puppet:///modules/site-apache/modules.d/${apache_cluster_node}/${name}.conf",
+            "puppet:///modules/site-apache/modules.d/${name}.conf",
+            "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.conf",
+            "puppet:///modules/apache/modules.d/${name}.conf"
         ],
-        default => "puppet://$server/$source",
+        default => "puppet:///$source",
     }
     file{"modules_${name}.conf":
         ensure => $ensure,
diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp
index 2cf5fd4..68a13b1 100644
--- a/manifests/openbsd.pp
+++ b/manifests/openbsd.pp
@@ -26,10 +26,10 @@ class apache::openbsd inherits apache::base {
     }
     file{'apache_main_config':
         path => "${config_dir}/conf/httpd.conf",
-        source => [ "puppet://$server/modules/site-apache/config/OpenBSD/${fqdn}/httpd.conf",
-                    "puppet://$server/modules/site-apache/config/OpenBSD/${apache_cluster_node}/httpd.conf",
-                    "puppet://$server/modules/site-apache/config/OpenBSD//httpd.conf",
-                    "puppet://$server/modules/apache/config/OpenBSD/httpd.conf" ],
+        source => [ "puppet:///modules/site-apache/config/OpenBSD/${fqdn}/httpd.conf",
+                    "puppet:///modules/site-apache/config/OpenBSD/${apache_cluster_node}/httpd.conf",
+                    "puppet:///modules/site-apache/config/OpenBSD//httpd.conf",
+                    "puppet:///modules/apache/config/OpenBSD/httpd.conf" ],
         notify => Service['apache'],
         owner => root, group => 0, mode => 0644;
     }
@@ -37,7 +37,7 @@ class apache::openbsd inherits apache::base {
         path => '/var/www/htdocs/default/www/index.html',
     }
     file{'/opt/bin/restart_apache.sh':
-        source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache.sh",
+        source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache.sh",
         require => File['/opt/bin'],
         owner => root, group => 0, mode => 0700;
     }
@@ -51,7 +51,7 @@ class apache::openbsd inherits apache::base {
         stop => 'apachectl stop',
     }
     file{'/opt/bin/apache_logrotate.sh':
-        source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh",
+        source => "puppet:///modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh",
         require => File['/opt/bin'],
         owner => root, group => 0, mode => 0700;
     }
diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp
index 6d357ee..0e221aa 100644
--- a/manifests/ssl/openbsd.pp
+++ b/manifests/ssl/openbsd.pp
@@ -10,7 +10,7 @@ class apache::ssl::openbsd inherits apache::openbsd {
     }
 
     File['/opt/bin/restart_apache.sh']{
-        source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh",
+        source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh",
     }
     Service['apache']{
         start => 'apachectl startssl',
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp
index 6ce8b7f..fca0a1e 100644
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -46,16 +46,16 @@ define apache::vhost::file(
         'absent': {
             $real_vhost_source = $vhost_source ? {
                 'absent'  => [
-                    "puppet://$server/modules/site-apache/vhosts.d/$fqdn/$name.conf",
-                    "puppet://$server/modules/site-apache/vhosts.d/$apache_cluster_node/$name.conf",
-                    "puppet://$server/modules/site-apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/modules/site-apache/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/modules/site-apache/vhosts.d/$name.conf",
-                    "puppet://$server/modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/modules/apache/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/modules/apache/vhosts.d/$name.conf"
+                    "puppet:///modules/site-apache/vhosts.d/$fqdn/$name.conf",
+                    "puppet:///modules/site-apache/vhosts.d/$apache_cluster_node/$name.conf",
+                    "puppet:///modules/site-apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/site-apache/vhosts.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/site-apache/vhosts.d/$name.conf",
+                    "puppet:///modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/apache/vhosts.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/apache/vhosts.d/$name.conf"
                 ],
-                default => "puppet://$server/$vhost_source",
+                default => "puppet:///$vhost_source",
             }
             File["${name}.conf"]{
                 source => $real_vhost_source,
@@ -77,9 +77,9 @@ define apache::vhost::file(
             }
             file{$real_htpasswd_path:
                 ensure => $ensure,
-                source => [ "puppet://$server/modules/site-apache/htpasswds/$fqdn/$name",
-                            "puppet://$server/modules/site-apache/htpasswds/$apache_cluster_node/$name",
-                            "puppet://$server/modules/site-apache/htpasswds/$name" ],
+                source => [ "puppet:///modules/site-apache/htpasswds/$fqdn/$name",
+                            "puppet:///modules/site-apache/htpasswds/$apache_cluster_node/$name",
+                            "puppet:///modules/site-apache/htpasswds/$name" ],
                 owner => root, group => 0, mode => 0644;
             }
         }
diff --git a/manifests/vhost/file/documentrootfile.pp b/manifests/vhost/file/documentrootfile.pp
index 441d605..dd8e565 100644
--- a/manifests/vhost/file/documentrootfile.pp
+++ b/manifests/vhost/file/documentrootfile.pp
@@ -7,15 +7,15 @@ define apache::vhost::file::documentrootfile(
       $mode=440
 ){
     file{"$documentroot/$filename":
-        source  => [ "puppet://$server/modules/site-apache/vhost_varieties/$fqdn/$thedomain/$filename",
-                    "puppet://$server/modules/site-apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename",
-                    "puppet://$server/modules/site-apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
-                    "puppet://$server/modules/site-apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-                    "puppet://$server/modules/site-apache/vhost_varieties/$thedomain/$filename",
-                    "puppet://$server/modules/apache/vhost_varieties/$thedomain/$filename",
-                    "puppet://$server/modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
-                    "puppet://$server/modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-                    "puppet://$server/modules/apache/vhost_varieties/$thedomain/$filename"
+        source  => [ "puppet:///modules/site-apache/vhost_varieties/$fqdn/$thedomain/$filename",
+                    "puppet:///modules/site-apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename",
+                    "puppet:///modules/site-apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
+                    "puppet:///modules/site-apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
+                    "puppet:///modules/site-apache/vhost_varieties/$thedomain/$filename",
+                    "puppet:///modules/apache/vhost_varieties/$thedomain/$filename",
+                    "puppet:///modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
+                    "puppet:///modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
+                    "puppet:///modules/apache/vhost_varieties/$thedomain/$filename"
                    ],
         ensure  => file,
         require => Apache::Vhost::Webdir["$thedomain"],
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index a6e2ff0..090e803 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -87,7 +87,7 @@ define apache::vhost::php::standard(
           'present' => directory,
           default => absent,
         },
-        source => "puppet://$server/modules/common/empty",
+        source => "puppet:///modules/common/empty",
         owner => $documentroot_owner, group => $documentroot_group, mode => 0750,
       }
       $php_safe_mode_exec_bins_subst = regsubst($php_safe_mode_exec_bins,"(.+)","${name}_\\1")