diff options
author | mh <mh@immerda.ch> | 2014-06-13 11:23:47 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-06-13 11:23:47 +0200 |
commit | ea1cf47e6a86d5641fc6655bff553c4dbe55b897 (patch) | |
tree | 74756634572631c2909b7ad35c6d8413668d7ed2 | |
parent | 0bbf3ce96c049cdcbc59dfdcef860f09d515f618 (diff) | |
parent | e9b58ecddca10758f38602768a9ed20c88eaa35f (diff) |
Merge branch 'averni-master'
-rw-r--r-- | manifests/client.pp | 1 | ||||
-rw-r--r-- | templates/munin-node.conf.erb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 6614709..724ff05 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -6,6 +6,7 @@ class munin::client( $allow = [ '127.0.0.1' ], $host = '*', + $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 4448002..b0c8fc8 100644 --- a/templates/munin-node.conf.erb +++ b/templates/munin-node.conf.erb @@ -34,7 +34,7 @@ ignore_file \.pod$ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 # -host_name <%= scope.lookupvar('::fqdn') %> +host_name <%= scope.lookupvar('munin::client::host_name') %> # A list of addresses that are allowed to connect. This must be a # regular expression, since Net::Server does not understand CIDR-style |