diff options
author | root <root@puppetmaster.black.co.at> | 2007-10-09 14:32:47 +0200 |
---|---|---|
committer | root <root@puppetmaster.black.co.at> | 2007-10-09 14:32:47 +0200 |
commit | 0529cd8c63d3ac806ded40e68f36102af282b117 (patch) | |
tree | 12c743bb64574e306845d6c008b8beef823ca621 | |
parent | 20d4a3dca5398a65d5eefec4ba6b293efe299764 (diff) |
sundry cleanup after offline work
-rw-r--r-- | manifests/client.pp | 2 | ||||
-rw-r--r-- | templates/defaultclient.erb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 8ee1552..5b78186 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -53,7 +53,7 @@ define munin::register() default => $munin_host } - @@file { "munin_node_${name}_${port}": path => "${NODESDIR}/${name}_${munin_port}", + @@file { "${NODESDIR}/${name}_${munin_port_real}": ensure => present, content => template("munin/defaultclient.erb"), } diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb index 0f7fc2e..954a0cb 100644 --- a/templates/defaultclient.erb +++ b/templates/defaultclient.erb @@ -3,7 +3,6 @@ dom = domain.downcase host = hostname.downcase fhost = name.downcase - ip = Facter['ip'] %> ### This syntax can be extended, it might get better ... #+<%= dom %> |