remove unnecessary fileserver variable (#2460)

diff --git a/manifests/client/openbsd.pp b/manifests/client/openbsd.pp
index 8de025e..7012c00 100644 (file)
--- a/manifests/client/openbsd.pp
+++ b/manifests/client/openbsd.pp
@@ -3,7 +3,7 @@
 class munin::client::openbsd inherits munin::client::base {
     if $operatingsystemrelease == '4.3' {
       file{'/usr/src/munin_openbsd.tar.gz':
-        source => "puppet://$server/modules/munin/openbsd/package/munin_openbsd.tar.gz",
+        source => "puppet:///modules/munin/openbsd/package/munin_openbsd.tar.gz",
         owner => root, group => 0, mode => 0600;
       }
       exec{'extract_openbsd':

diff --git a/manifests/host.pp b/manifests/host.pp
index 87d3255..e038fd7 100644 (file)
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -9,11 +9,11 @@ class munin::host inherits munin
     File <<| tag == 'munin' |>>
 
     file{'/etc/munin/munin.conf.header':
-        source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/munin.conf.header",
-                    "puppet://$server/modules/site-munin/config/host/munin.conf.header.$operatingsystem",
-                    "puppet://$server/modules/site-munin/config/host/munin.conf.header",
-                    "puppet://$server/modules/munin/config/host/munin.conf.header.$operatingsystem",
-                    "puppet://$server/modules/munin/config/host/munin.conf.header" ],
+        source => [ "puppet:///modules/site-munin/config/host/${fqdn}/munin.conf.header",
+                    "puppet:///modules/site-munin/config/host/munin.conf.header.$operatingsystem",
+                    "puppet:///modules/site-munin/config/host/munin.conf.header",
+                    "puppet:///modules/munin/config/host/munin.conf.header.$operatingsystem",
+                    "puppet:///modules/munin/config/host/munin.conf.header" ],
         notify => Exec['concat_/etc/munin/munin.conf'],
         owner => root, group => 0, mode => 0644;
     }

diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp
index aeb0cdf..6fd50df 100644 (file)
--- a/manifests/host/cgi.pp
+++ b/manifests/host/cgi.pp
@@ -6,11 +6,11 @@ class munin::host::cgi {
     }
 
     file{'/etc/logrotate.d/munin':
-        source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/logrotate",
-                    "puppet://$server/modules/site-munin/config/host/logrotate.$operatingsystem",
-                    "puppet://$server/modules/site-munin/config/host/logrotate",
-                    "puppet://$server/modules/munin/config/host/logrotate.$operatingsystem",
-                    "puppet://$server/modules/munin/config/host/logrotate" ],
+        source => [ "puppet:///modules/site-munin/config/host/${fqdn}/logrotate",
+                    "puppet:///modules/site-munin/config/host/logrotate.$operatingsystem",
+                    "puppet:///modules/site-munin/config/host/logrotate",
+                    "puppet:///modules/munin/config/host/logrotate.$operatingsystem",
+                    "puppet:///modules/munin/config/host/logrotate" ],
         owner => root, group => 0, mode => 0644;
     }
 }

diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
index 846a873..67cbfb8 100644 (file)
--- a/manifests/plugin/deploy.pp
+++ b/manifests/plugin/deploy.pp
@@ -11,7 +11,7 @@ define munin::plugin::deploy($source = '', $ensure = 'present', $config = '') {
     include munin::plugin::scriptpaths
     file { "munin_plugin_${name}":
             path => "$munin::plugin::scriptpaths::script_path/${name}",
-            source => "puppet://$server/modules/$real_source",
+            source => "puppet:///modules/$real_source",
             mode => 0755, owner => root, group => 0;
     }
 

diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
index e0d445c..c2c5ed3 100644 (file)
--- a/manifests/plugins/setup.pp
+++ b/manifests/plugins/setup.pp
@@ -1,7 +1,7 @@
 class munin::plugins::setup {
   file {
     [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
-      source => "puppet://$server/modules/common/empty",
+      source => "puppet:///modules/common/empty",
       ignore => [ '.ignore', 'snmp_*' ],
       ensure => directory, checksum => mtime,
       recurse => true, purge => true, force => true,

diff --git a/manifests/snmp_collector.pp b/manifests/snmp_collector.pp
index 6f3fe34..7bd8bba 100644 (file)
--- a/manifests/snmp_collector.pp
+++ b/manifests/snmp_collector.pp
@@ -1,7 +1,7 @@
 class munin::snmp_collector{
     file {
         "/var/lib/puppet/modules/munin/create_snmp_links":
-            source => "puppet://$server/modules/munin/create_snmp_links.sh",
+            source => "puppet:///modules/munin/create_snmp_links.sh",
             mode => 755, owner => root, group => 0;
     }