diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 10:22:48 +0200 |
|---|---|---|
| committer | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 10:22:48 +0200 |
| commit | 447041b01494690975d078776a85f4a3fd4e64fa (patch) | |
| tree | 0d09932e8466de8208144aa034de401398151ca6 /templates | |
| parent | 553fbe3e1d3c6865172c1db8cf93d69fb936dc18 (diff) | |
| parent | eb953716cd545f86972e85d983b5862c194f5aed (diff) | |
merge with immerda/master
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/client.erb | 11 | ||||
| l--------- | templates/munin-node.conf.Debian.lucid | 1 | ||||
| -rw-r--r-- | templates/munin-node.conf.default | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/templates/client.erb b/templates/client.erb index 286631f..15e05c6 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -1,7 +1,7 @@ <% - # Downcase all information - dom = domain.downcase - host = hostname.downcase + # Downcase all information + dom = domain.downcase + host = hostname.downcase %> ### Munin client from Puppet template @@ -12,7 +12,8 @@ # Description: <%= description.gsub!(/\n/, ' ') %> <% end -%> [<%= fhost.downcase %>] - address <%= munin_host_real -%> -<% if config -%><% config.each do |val| -%> + address <%= munin_host_real %> + port <%= munin_port_real %> +<% if config -%><% config.each do |val| -%> <%= val -%> <% end -%><% end -%> diff --git a/templates/munin-node.conf.Debian.lucid b/templates/munin-node.conf.Debian.lucid new file mode 120000 index 0000000..e0646b9 --- /dev/null +++ b/templates/munin-node.conf.Debian.lucid @@ -0,0 +1 @@ +munin-node.conf.Debian.etch
\ No newline at end of file diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index 85c0051..be62848 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -1,6 +1,9 @@ ########## ########## Managed by puppet ########## +# +# Example config-file for munin-node +# log_level 4 log_file /var/log/munin/munin-node.log |