summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/munin-node.conf.Debian.etch2
-rw-r--r--[l---------]templates/munin-node.conf.Debian.lenny40
l---------templates/munin-node.conf.Debian.sid2
l---------templates/munin-node.conf.Debian.squeeze2
-rw-r--r--templates/munin-node.conf.Debian.wheezy57
-rw-r--r--templates/munin-node.conf.OpenBSD2
-rw-r--r--templates/munin-node.conf.Ubuntu8
-rw-r--r--templates/site.conf9
8 files changed, 113 insertions, 9 deletions
diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch
index 44638e7..9763772 100644
--- a/templates/munin-node.conf.Debian.etch
+++ b/templates/munin-node.conf.Debian.etch
@@ -27,7 +27,7 @@ ignore_file \.rpm(save|new)$
# telnetting to localhost, port 4949
#
#host_name localhost.localdomain
-host_name <%= fqdn %>
+host_name <%= scope.lookupvar('::fqdn') %>
# A list of addresses that are allowed to connect. This must be a
# regular expression, due to brain damage in Net::Server, which
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny
index e0646b9..9763772 120000..100644
--- a/templates/munin-node.conf.Debian.lenny
+++ b/templates/munin-node.conf.Debian.lenny
@@ -1 +1,39 @@
-munin-node.conf.Debian.etch \ No newline at end of file
+##########
+########## Managed by puppet
+##########
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /var/run/munin/munin-node.pid
+background 1
+setseid 1
+
+# Which host/port to bind to;
+host <%= scope.lookupvar('munin::client::host') %>
+port <%= scope.lookupvar('munin::client::port') %>
+user root
+group root
+setsid yes
+
+# Regexps for files to ignore
+
+ignore_file ~$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+
+# Set this if the client doesn't report the correct hostname when
+# telnetting to localhost, port 4949
+#
+#host_name localhost.localdomain
+host_name <%= scope.lookupvar('::fqdn') %>
+
+# A list of addresses that are allowed to connect. This must be a
+# regular expression, due to brain damage in Net::Server, which
+# doesn't understand CIDR-style network notation. You may repeat
+# the allow line as many times as you'd like
+<% scope.lookupvar('munin::client::allow').each do |allow| -%>
+allow <%= "^#{Regexp.escape(allow)}$" %>
+<% end -%>
+
diff --git a/templates/munin-node.conf.Debian.sid b/templates/munin-node.conf.Debian.sid
index e0646b9..6b8d690 120000
--- a/templates/munin-node.conf.Debian.sid
+++ b/templates/munin-node.conf.Debian.sid
@@ -1 +1 @@
-munin-node.conf.Debian.etch \ No newline at end of file
+munin-node.conf.Debian.lenny \ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.squeeze b/templates/munin-node.conf.Debian.squeeze
index e0646b9..6b8d690 120000
--- a/templates/munin-node.conf.Debian.squeeze
+++ b/templates/munin-node.conf.Debian.squeeze
@@ -1 +1 @@
-munin-node.conf.Debian.etch \ No newline at end of file
+munin-node.conf.Debian.lenny \ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.wheezy b/templates/munin-node.conf.Debian.wheezy
new file mode 100644
index 0000000..fe6f27f
--- /dev/null
+++ b/templates/munin-node.conf.Debian.wheezy
@@ -0,0 +1,57 @@
+##########
+########## Managed by puppet
+##########
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /var/run/munin/munin-node.pid
+
+background 1
+setsid 1
+
+user root
+group root
+
+# Regexps for files to ignore
+
+ignore_file ~$
+#ignore_file [#~]$ # FIX doesn't work. '#' starts a comment
+ignore_file DEADJOE$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+ignore_file \.pod$
+
+# Set this if the client doesn't report the correct hostname when
+# telnetting to localhost, port 4949
+#
+#host_name localhost.localdomain
+host_name <%= scope.lookupvar('::fqdn') %>
+
+# A list of addresses that are allowed to connect. This must be a
+# regular expression, since Net::Server does not understand CIDR-style
+# network notation unless the perl module Net::CIDR is installed. You
+# may repeat the allow line as many times as you'd like
+
+<% scope.lookupvar('munin::client::allow').each do |allow| -%>
+allow <%= "^#{Regexp.escape(allow)}$" %>
+<% end -%>
+
+# If you have installed the Net::CIDR perl module, you can use one or more
+# cidr_allow and cidr_deny address/mask patterns. A connecting client must
+# match any cidr_allow, and not match any cidr_deny. Note that a netmask
+# *must* be provided, even if it's /32
+#
+# Example:
+#
+# cidr_allow 127.0.0.1/32
+# cidr_allow 192.0.2.0/24
+# cidr_deny 192.0.2.42/32
+
+# Which address to bind to;
+host <%= scope.lookupvar('munin::client::host') %>
+
+# And which port
+port <%= scope.lookupvar('munin::client::port') %>
+
diff --git a/templates/munin-node.conf.OpenBSD b/templates/munin-node.conf.OpenBSD
index 4e2f534..14b658e 100644
--- a/templates/munin-node.conf.OpenBSD
+++ b/templates/munin-node.conf.OpenBSD
@@ -28,7 +28,7 @@ ignore_file \.pod$
# telnetting to localhost, port 4949
#
#host_name localhost.localdomain
-host_name <%= fqdn %>
+host_name <%= scope.lookupvar('::fqdn') %>
# A list of addresses that are allowed to connect. This must be a
# regular expression, since Net::Server does not understand CIDR-style
diff --git a/templates/munin-node.conf.Ubuntu b/templates/munin-node.conf.Ubuntu
index 17162d8..9763772 100644
--- a/templates/munin-node.conf.Ubuntu
+++ b/templates/munin-node.conf.Ubuntu
@@ -9,8 +9,8 @@ background 1
setseid 1
# Which host/port to bind to;
-host <%= scope.function_hiera('munin_host','*') %>
-port <%= scope.function_hiera('munin_port','4949') %>
+host <%= scope.lookupvar('munin::client::host') %>
+port <%= scope.lookupvar('munin::client::port') %>
user root
group root
setsid yes
@@ -27,13 +27,13 @@ ignore_file \.rpm(save|new)$
# telnetting to localhost, port 4949
#
#host_name localhost.localdomain
-host_name <%= fqdn %>
+host_name <%= scope.lookupvar('::fqdn') %>
# A list of addresses that are allowed to connect. This must be a
# regular expression, due to brain damage in Net::Server, which
# doesn't understand CIDR-style network notation. You may repeat
# the allow line as many times as you'd like
-<% scope.function_hiera('munin_allow',['127.0.0.1']).each do |allow| -%>
+<% scope.lookupvar('munin::client::allow').each do |allow| -%>
allow <%= "^#{Regexp.escape(allow)}$" %>
<% end -%>
diff --git a/templates/site.conf b/templates/site.conf
new file mode 100644
index 0000000..52ddb53
--- /dev/null
+++ b/templates/site.conf
@@ -0,0 +1,9 @@
+<VirtualHost *>
+ ServerName <%= name %>
+ DocumentRoot /var/cache/munin/www/
+ <Location />
+ order allow,deny
+ Allow from all
+ </Location>
+</VirtualHost>
+