summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-04-24 12:26:34 +0000
committermh <mh@immerda.ch>2008-04-24 12:26:34 +0000
commit470e23c19625c8aa6e9e68085d284fa8be01bc3e (patch)
tree377adb17100a5e14109e36861963f3bcc88a95ea
parenteeb818d8d3d16bda743dd007fedcb4de25ba2027 (diff)
unified fileserver location, in the future the fileserver should only be accessed by $server
-rw-r--r--manifests/host.pp2
-rw-r--r--manifests/plugin.pp6
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,