unified fileserver location, in the future the fileserver should only be accessed...
authormh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Thu, 24 Apr 2008 12:26:34 +0000 (12:26 +0000)
committermh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Thu, 24 Apr 2008 12:26:34 +0000 (12:26 +0000)
git-svn-id: https://svn/ipuppet/trunk/modules/munin@1251 d66ca3ae-40d7-4aa7-90d4-87d79ca94279

manifests/host.pp
manifests/plugin.pp

index 4625ba9..d49c5a2 100644 (file)
@@ -27,7 +27,7 @@ class munin::snmp_collector
 
        file { 
                "/var/lib/puppet/modules/munin/create_snmp_links":
-                       source => "puppet://$servername/munin/create_snmp_links.sh",
+                       source => "puppet://$server/munin/create_snmp_links.sh",
                        mode => 755, owner => root, group => 0;
        }
 
index 161bf88..ac25abf 100644 (file)
@@ -101,7 +101,7 @@ define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') {
        debug ( "munin_plugin_${name}: name=$name, source=$source, script_path=$munin::plugin::scriptpaths::script_path" )
     file { "munin_plugin_${name}":
             path => "$munin::plugin::scriptpaths::script_path/${name}",
-            source => "puppet://$servername/$real_source",
+            source => "puppet://$server/$real_source",
             ensure => file,
             mode => 0755, owner => root, group => 0;
     }
@@ -116,7 +116,7 @@ class munin::plugins::base {
                centos: {               
                    file {
                        [ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-                               source => "puppet://$servername/munin/empty",
+                               source => "puppet://$server/munin/empty",
                                ensure => directory, checksum => mtime,
                                recurse => true, purge => true, force => true, 
                                mode => 0755, owner => root, group => 0;
@@ -129,7 +129,7 @@ class munin::plugins::base {
                default: {
                    file {
                        [ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-                               source => "puppet://$servername/munin/empty",
+                               source => "puppet://$server/munin/empty",
                                ensure => directory, checksum => mtime,
                                recurse => true, purge => true, force => true, 
                                mode => 0755, owner => root, group => 0,