From 82d90e5f3d3dc8cf0daeb58e8fe597eef7738ae8 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Sat, 2 Aug 2008 13:11:24 +0200 Subject: munin-node.conf can be used unmodified for lenny --- templates/munin-node.conf.Debian.lenny | 1 + 1 file changed, 1 insertion(+) create mode 120000 templates/munin-node.conf.Debian.lenny (limited to 'templates') diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny new file mode 120000 index 0000000..e0646b9 --- /dev/null +++ b/templates/munin-node.conf.Debian.lenny @@ -0,0 +1 @@ +munin-node.conf.Debian.etch \ No newline at end of file -- cgit v1.2.3 From c9c389010b40f1768f039200539cf27a032d0348 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Mon, 8 Sep 2008 20:12:12 +0200 Subject: add apache site --- templates/site.conf | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 templates/site.conf (limited to 'templates') diff --git a/templates/site.conf b/templates/site.conf new file mode 100644 index 0000000..549437c --- /dev/null +++ b/templates/site.conf @@ -0,0 +1,9 @@ + + ServerName <%= name %> + DocumentRoot /var/www/munin/ + + order allow,deny + Allow from all + + + -- cgit v1.2.3 From c0abb341bfdd1061c85d0349b9a880de6047728f Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 3 Jun 2009 11:11:45 +0200 Subject: use cidr_allow in lenny and newer This change keeps munin_allow for etch and feisty, since I don't know whether cidr_allow is already possible there. Everyone else should change to the much nicer CIDR notation of cidr_allow. You can use an array to specify multiple rules. --- templates/munin-node.conf.Debian.lenny | 44 +++++++++++++++++++++++++++++++- templates/munin-node.conf.Debian.sid | 2 +- templates/munin-node.conf.Debian.squeeze | 1 + 3 files changed, 45 insertions(+), 2 deletions(-) mode change 120000 => 100644 templates/munin-node.conf.Debian.lenny create mode 120000 templates/munin-node.conf.Debian.squeeze (limited to 'templates') diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian.lenny +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Debian.etch \ No newline at end of file diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny new file mode 100644 index 0000000..07f4980 --- /dev/null +++ b/templates/munin-node.conf.Debian.lenny @@ -0,0 +1,43 @@ +########## +########## 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 <%= munin_host_real %> +port <%= munin_port_real %> +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 <%= fqdn %> + +# A list of addresses that are allowed to connect. +<% +if ! munin_cidr_allow.is_a?(Array) then + allows = [ munin_cidr_allow ] +else + allows = munin_cidr_allow +end + +allows.each do |cidr| +-%> +cidr_allow <%= cidr %> +<% 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 new file mode 120000 index 0000000..6b8d690 --- /dev/null +++ b/templates/munin-node.conf.Debian.squeeze @@ -0,0 +1 @@ +munin-node.conf.Debian.lenny \ No newline at end of file -- cgit v1.2.3 From 9e3a03b42c2426988cef1a1da236aa16ee54f125 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 3 Jun 2009 15:09:52 +0200 Subject: remove superfluous graph_period specification --- templates/defaultclient.erb | 1 - 1 file changed, 1 deletion(-) (limited to 'templates') diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb index 954a0cb..ddce1bb 100644 --- a/templates/defaultclient.erb +++ b/templates/defaultclient.erb @@ -11,4 +11,3 @@ address <%= munin_host_real %> port <%= munin_port_real %> use_node_name yes - exim_mailstats.graph_period minute -- cgit v1.2.3 From 8f711a933dbc0917b43d5e29b98da7157bd5727f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 19:48:36 -0500 Subject: fix some merge problems --- templates/defaultclient.erb | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates') diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb index 7d754a7..5611bf4 100644 --- a/templates/defaultclient.erb +++ b/templates/defaultclient.erb @@ -11,8 +11,5 @@ address <%= munin_host_real %> port <%= munin_port_real %> use_node_name yes -<<<<<<< HEAD -======= load.load.warning 5 load.load.critical 10 ->>>>>>> 76352415fec5c2ab6975e3a8843dd4983f7cae6a -- cgit v1.2.3