diff options
author | antonio <me.verni@gmail.com> | 2014-06-12 00:41:18 +0200 |
---|---|---|
committer | antonio <me.verni@gmail.com> | 2014-06-12 00:44:26 +0200 |
commit | 29919e02a8b3f27d9d516be586e92704b806a48e (patch) | |
tree | a4462a2e788ecf9d194e7aaba93f6f6c39dbe0c2 | |
parent | d09774c635ea72932727d6724ee847942ddafb77 (diff) |
changed host_name default to ::fqdn
-rw-r--r-- | manifests/client.pp | 2 | ||||
-rw-r--r-- | templates/munin-node.conf.erb | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 7a96233..724ff05 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -6,7 +6,7 @@ class munin::client( $allow = [ '127.0.0.1' ], $host = '*', - $host_name = '::fqdn', + $host_name = $::fqdn, $port = '4949', $use_ssh = false, $manage_shorewall = false, diff --git a/templates/munin-node.conf.erb b/templates/munin-node.conf.erb index 891203c..b0c8fc8 100644 --- a/templates/munin-node.conf.erb +++ b/templates/munin-node.conf.erb @@ -34,11 +34,7 @@ ignore_file \.pod$ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 # -<% if scope.lookupvar('munin::client::host_name') == '::fqdn' -%> -host_name <%= scope.lookupvar('::fqdn') %> -<% else -%> host_name <%= scope.lookupvar('munin::client::host_name') %> -<% end -%> # A list of addresses that are allowed to connect. This must be a # regular expression, since Net::Server does not understand CIDR-style |