tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

munin: Use hostnames in node definitions

Browse source
This commit is contained in:
Ossi Salmi 2013-06-15 20:07:49 +03:00
parent fae8257a89
commit aa2b4b38ce
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
munin/manifests/init.pp
View file

@ -67,10 +67,7 @@ class munin::node {
@@file { "/etc/munin/conf.d/${homename}.conf": @@file { "/etc/munin/conf.d/${homename}.conf":
ensure => present, ensure => present,
content => $::ec2_public_ipv4 ? { content => "[${homename}]\n address ${homename}\n use_node_name yes\n",
"" => "[${homename}]\n address ${ipaddress}\n use_node_name yes\n",
default => "[${homename}]\n address ${ec2_public_ipv4}\n use_node_name yes\n",
},
tag => "munin", tag => "munin",
} }

2
munin/templates/munin-node.conf.erb
View file

@ -42,7 +42,7 @@ allow <%= "^%s$" % allow.gsub('.', '\.') %>
<% end -%> <% end -%>
# Which address to bind to; # Which address to bind to;
host <%= @ipaddress %> host *
# And which port # And which port
port 4949 port 4949

3
munin/templates/munin.conf.erb
View file

@ -16,6 +16,9 @@ graph_strategy cgi
cgiurl_graph /munin/cgi/munin-cgi-graph cgiurl_graph /munin/cgi/munin-cgi-graph
<% if @munin_tls == "true" -%> <% if @munin_tls == "true" -%>
# Force munin-update to use IPv4 to workaround broken IPv6 support
local_address <%= @ipaddress %>
# Require TLS # Require TLS
tls paranoid tls paranoid
tls_verify_certificate yes tls_verify_certificate yes