diff options
author | mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279> | 2008-04-24 12:26:34 +0000 |
---|---|---|
committer | mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279> | 2008-04-24 12:26:34 +0000 |
commit | b1381333f577b0b4c6ff17a2cfff1abfa58c00e3 (patch) | |
tree | 377adb17100a5e14109e36861963f3bcc88a95ea | |
parent | a3ac1c067e22f25b6fa5643873a4a935358561f1 (diff) |
unified fileserver location, in the future the fileserver should only be accessed by $server
git-svn-id: https://svn/ipuppet/trunk/modules/munin@1251 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
-rw-r--r-- | manifests/host.pp | 2 | ||||
-rw-r--r-- | manifests/plugin.pp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index 4625ba9..d49c5a2 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -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; } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 161bf88..ac25abf 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -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, |