From 2967c1c524242b26481985cf50b11821826f18d5 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 31 May 2013 21:01:32 +0200 Subject: update to latest upstream --- templates/munin-node.conf.default | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'templates') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index 9d7f32f..cb9cf43 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -15,6 +15,16 @@ setsid 1 user root group 0 +# This is the timeout for the whole transaction. +# Units are in sec. Default is 15 min +# +# global_timeout 900 + +# This is the timeout for each plugin. +# Units are in sec. Default is 1 min +# +# timeout 60 + # Regexps for files to ignore ignore_file [\#~]$ ignore_file DEADJOE$ -- cgit v1.2.3 From 02a8971459a201b9165909593c250122b0c06c1b Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 3 Jun 2013 14:24:20 +0200 Subject: Use @var style for puppet 3.2 compatibility --- templates/client.erb | 24 ++++++++++++------------ templates/munin-node.conf.default | 2 +- templates/site.conf | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'templates') diff --git a/templates/client.erb b/templates/client.erb index ba03da5..83d5a64 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -5,20 +5,20 @@ %> ### Munin client from Puppet template -# Domain: <%= dom %> -# Registered on: <%= h %> -# Type: <%= client_type %> -<% if description != 'absent' -%> -# Description: <%= description.gsub!(/\n/, ' ') %> +# Domain: <%= @dom %> +# Registered on: <%= @h %> +# Type: <%= @client_type %> +<% if @description != 'absent' -%> +# Description: <%= @description.gsub!(/\n/, ' ') %> <% end -%> -[<%= fhost.downcase %>] -<% if use_ssh -%> - address ssh://<%= host %>/bin/nc localhost <%= port %> +[<%= @fhost.downcase %>] +<% if @use_ssh -%> + address ssh://<%= @host %>/bin/nc localhost <%= @port %> <% else -%> - address <%= host %> - port <%= port %> + address <%= @host %> + port <%= @port %> <% end -%> -<% if config -%><% config.each do |val| -%> - <%= val -%> +<% if @config -%><% @config.each do |val| -%> + <%= @val -%> <% end -%><% end -%> diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index 9d7f32f..cff7154 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -28,7 +28,7 @@ ignore_file \.pod$ # telnetting to localhost, port 4949 # #host_name localhost.localdomain -host_name <%= fqdn %> +host_name <%= @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/site.conf b/templates/site.conf index 52ddb53..842bde0 100644 --- a/templates/site.conf +++ b/templates/site.conf @@ -1,5 +1,5 @@ - ServerName <%= name %> + ServerName <%= @name %> DocumentRoot /var/cache/munin/www/ order allow,deny -- cgit v1.2.3 From db5a0032698b55f2a4403d55312e81ea2d127ea6 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 20 Nov 2013 14:14:11 +0100 Subject: Add CloudLinux support --- templates/munin-node.conf.CloudLinux | 1 + 1 file changed, 1 insertion(+) create mode 120000 templates/munin-node.conf.CloudLinux (limited to 'templates') diff --git a/templates/munin-node.conf.CloudLinux b/templates/munin-node.conf.CloudLinux new file mode 120000 index 0000000..082b30c --- /dev/null +++ b/templates/munin-node.conf.CloudLinux @@ -0,0 +1 @@ +munin-node.conf.default \ No newline at end of file -- cgit v1.2.3 From 057658ba93e2562c596dfa5607836679631be916 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 2 Jul 2013 22:49:02 +0200 Subject: Unify OS specific munin-conf.conf In essence all munin-node.conf files contained the same template, besides a few values. By moving all to a single template, maintenance burden is reduced. To ensure all values are still present in the templates, tests are added. --- templates/munin-node.conf.CentOS | 1 - templates/munin-node.conf.CentOS. | 1 - templates/munin-node.conf.CentOS.5 | 1 - templates/munin-node.conf.Debian | 1 - templates/munin-node.conf.Debian.etch | 39 ------------------ templates/munin-node.conf.Debian.feisty | 1 - templates/munin-node.conf.Debian.gutsy | 1 - templates/munin-node.conf.Debian.hardy | 1 - templates/munin-node.conf.Debian.lenny | 39 ------------------ templates/munin-node.conf.Debian.lucid | 1 - templates/munin-node.conf.Debian.sarge | 1 - templates/munin-node.conf.Debian.sid | 1 - templates/munin-node.conf.Debian.squeeze | 1 - templates/munin-node.conf.Debian.wheezy | 57 -------------------------- templates/munin-node.conf.Gentoo | 1 - templates/munin-node.conf.Gentoo. | 1 - templates/munin-node.conf.OpenBSD | 59 --------------------------- templates/munin-node.conf.Ubuntu | 39 ------------------ templates/munin-node.conf.Ubuntu.precise | 1 - templates/munin-node.conf.Ubuntu.quantal | 1 - templates/munin-node.conf.default | 69 -------------------------------- templates/munin-node.conf.erb | 62 ++++++++++++++++++++++++++++ templates/site.conf | 9 ----- 23 files changed, 62 insertions(+), 326 deletions(-) delete mode 120000 templates/munin-node.conf.CentOS delete mode 120000 templates/munin-node.conf.CentOS. delete mode 120000 templates/munin-node.conf.CentOS.5 delete mode 120000 templates/munin-node.conf.Debian delete mode 100644 templates/munin-node.conf.Debian.etch delete mode 120000 templates/munin-node.conf.Debian.feisty delete mode 120000 templates/munin-node.conf.Debian.gutsy delete mode 120000 templates/munin-node.conf.Debian.hardy delete mode 100644 templates/munin-node.conf.Debian.lenny delete mode 120000 templates/munin-node.conf.Debian.lucid delete mode 120000 templates/munin-node.conf.Debian.sarge delete mode 120000 templates/munin-node.conf.Debian.sid delete mode 120000 templates/munin-node.conf.Debian.squeeze delete mode 100644 templates/munin-node.conf.Debian.wheezy delete mode 120000 templates/munin-node.conf.Gentoo delete mode 120000 templates/munin-node.conf.Gentoo. delete mode 100644 templates/munin-node.conf.OpenBSD delete mode 100644 templates/munin-node.conf.Ubuntu delete mode 120000 templates/munin-node.conf.Ubuntu.precise delete mode 120000 templates/munin-node.conf.Ubuntu.quantal delete mode 100644 templates/munin-node.conf.default create mode 100644 templates/munin-node.conf.erb delete mode 100644 templates/site.conf (limited to 'templates') diff --git a/templates/munin-node.conf.CentOS b/templates/munin-node.conf.CentOS deleted file mode 120000 index 082b30c..0000000 --- a/templates/munin-node.conf.CentOS +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.default \ No newline at end of file diff --git a/templates/munin-node.conf.CentOS. b/templates/munin-node.conf.CentOS. deleted file mode 120000 index 082b30c..0000000 --- a/templates/munin-node.conf.CentOS. +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.default \ No newline at end of file diff --git a/templates/munin-node.conf.CentOS.5 b/templates/munin-node.conf.CentOS.5 deleted file mode 120000 index 082b30c..0000000 --- a/templates/munin-node.conf.CentOS.5 +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.default \ No newline at end of file diff --git a/templates/munin-node.conf.Debian b/templates/munin-node.conf.Debian deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Debian.etch \ No newline at end of file diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch deleted file mode 100644 index 9763772..0000000 --- a/templates/munin-node.conf.Debian.etch +++ /dev/null @@ -1,39 +0,0 @@ -########## -########## 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.feisty b/templates/munin-node.conf.Debian.feisty deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian.feisty +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Debian.etch \ No newline at end of file diff --git a/templates/munin-node.conf.Debian.gutsy b/templates/munin-node.conf.Debian.gutsy deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian.gutsy +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Debian.etch \ No newline at end of file diff --git a/templates/munin-node.conf.Debian.hardy b/templates/munin-node.conf.Debian.hardy deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian.hardy +++ /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 deleted file mode 100644 index 9763772..0000000 --- a/templates/munin-node.conf.Debian.lenny +++ /dev/null @@ -1,39 +0,0 @@ -########## -########## 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.lucid b/templates/munin-node.conf.Debian.lucid deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian.lucid +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Debian.etch \ No newline at end of file diff --git a/templates/munin-node.conf.Debian.sarge b/templates/munin-node.conf.Debian.sarge deleted file mode 120000 index e0646b9..0000000 --- a/templates/munin-node.conf.Debian.sarge +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Debian.etch \ No newline at end of file diff --git a/templates/munin-node.conf.Debian.sid b/templates/munin-node.conf.Debian.sid deleted file mode 120000 index 6b8d690..0000000 --- a/templates/munin-node.conf.Debian.sid +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 6b8d690..0000000 --- a/templates/munin-node.conf.Debian.squeeze +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index fe6f27f..0000000 --- a/templates/munin-node.conf.Debian.wheezy +++ /dev/null @@ -1,57 +0,0 @@ -########## -########## 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.Gentoo b/templates/munin-node.conf.Gentoo deleted file mode 120000 index 082b30c..0000000 --- a/templates/munin-node.conf.Gentoo +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.default \ No newline at end of file diff --git a/templates/munin-node.conf.Gentoo. b/templates/munin-node.conf.Gentoo. deleted file mode 120000 index fd16e50..0000000 --- a/templates/munin-node.conf.Gentoo. +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Gentoo \ No newline at end of file diff --git a/templates/munin-node.conf.OpenBSD b/templates/munin-node.conf.OpenBSD deleted file mode 100644 index 14b658e..0000000 --- a/templates/munin-node.conf.OpenBSD +++ /dev/null @@ -1,59 +0,0 @@ -########## -########## Managed by puppet -########## -# -# Example config-file for munin-node -# - -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 0 - -# Regexps for files to ignore -ignore_file ~$ -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') %> -# host 127.0.0.1 - -# And which port -port <%= scope.lookupvar('munin::client::port') %> - diff --git a/templates/munin-node.conf.Ubuntu b/templates/munin-node.conf.Ubuntu deleted file mode 100644 index 9763772..0000000 --- a/templates/munin-node.conf.Ubuntu +++ /dev/null @@ -1,39 +0,0 @@ -########## -########## 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.Ubuntu.precise b/templates/munin-node.conf.Ubuntu.precise deleted file mode 120000 index d8fcb24..0000000 --- a/templates/munin-node.conf.Ubuntu.precise +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Ubuntu \ No newline at end of file diff --git a/templates/munin-node.conf.Ubuntu.quantal b/templates/munin-node.conf.Ubuntu.quantal deleted file mode 120000 index d8fcb24..0000000 --- a/templates/munin-node.conf.Ubuntu.quantal +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.Ubuntu \ No newline at end of file diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default deleted file mode 100644 index dc7c4fc..0000000 --- a/templates/munin-node.conf.default +++ /dev/null @@ -1,69 +0,0 @@ -########## -########## Managed by puppet -########## -# -# Example config-file for munin-node -# - -log_level 4 -log_file /var/log/munin-node/munin-node.log -pid_file /var/run/munin/munin-node.pid - -background 1 -setsid 1 - -user root -group 0 - -# This is the timeout for the whole transaction. -# Units are in sec. Default is 15 min -# -# global_timeout 900 - -# This is the timeout for each plugin. -# Units are in sec. Default is 1 min -# -# timeout 60 - -# Regexps for files to ignore -ignore_file [\#~]$ -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 <%= @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') %> -# host 127.0.0.1 - -# And which port -port <%= scope.lookupvar('munin::client::port') %> - diff --git a/templates/munin-node.conf.erb b/templates/munin-node.conf.erb new file mode 100644 index 0000000..5e015d2 --- /dev/null +++ b/templates/munin-node.conf.erb @@ -0,0 +1,62 @@ +########## +########## Managed by puppet +########## + +log_level 4 +log_file <%= @log_file %> +pid_file /var/run/munin/munin-node.pid + +background 1 +setsid 1 + +user <%= @user %> +group <%= @group %> + +# This is the timeout for the whole transaction. +# Units are in sec. Default is 15 min +# +# global_timeout 900 + +# This is the timeout for each plugin. +# Units are in sec. Default is 1 min +# +# timeout 60 + +# Regexps for files to ignore +ignore_file [\#~]$ +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 <%= 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/site.conf b/templates/site.conf deleted file mode 100644 index 842bde0..0000000 --- a/templates/site.conf +++ /dev/null @@ -1,9 +0,0 @@ - - ServerName <%= @name %> - DocumentRoot /var/cache/munin/www/ - - order allow,deny - Allow from all - - - -- cgit v1.2.3 From 9bee8a31f2305dda884aeab3caf3bf91cd8603ba Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 2 Jul 2013 23:07:00 +0200 Subject: Unify logrotate files into templates --- templates/logrotate.conf.erb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 templates/logrotate.conf.erb (limited to 'templates') diff --git a/templates/logrotate.conf.erb b/templates/logrotate.conf.erb new file mode 100644 index 0000000..0e3e6ca --- /dev/null +++ b/templates/logrotate.conf.erb @@ -0,0 +1,35 @@ +/var/log/munin/munin-update.log { + daily + missingok + rotate 7 + compress + notifempty + create 640 munin adm +} + +/var/log/munin/munin-graph.log { + daily + missingok + rotate 7 + compress + notifempty + create 660 munin <%= @apache_user %> +} + +/var/log/munin/munin-html.log { + daily + missingok + rotate 7 + compress + notifempty + create 640 munin adm +} + +/var/log/munin/munin-limits.log { + daily + missingok + rotate 7 + compress + notifempty + create 640 munin adm +} -- cgit v1.2.3 From c08b0ee68847c5e7017bb04c47f7f85b796ea0b9 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 28 Jan 2014 21:28:15 +0100 Subject: remove obsolete link --- templates/munin-node.conf.CloudLinux | 1 - 1 file changed, 1 deletion(-) delete mode 120000 templates/munin-node.conf.CloudLinux (limited to 'templates') diff --git a/templates/munin-node.conf.CloudLinux b/templates/munin-node.conf.CloudLinux deleted file mode 120000 index 082b30c..0000000 --- a/templates/munin-node.conf.CloudLinux +++ /dev/null @@ -1 +0,0 @@ -munin-node.conf.default \ No newline at end of file -- cgit v1.2.3 From fc4d4d204b2eb3e8f1848fc46f6f4cfc7584f84e Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 29 Jan 2014 23:26:56 +0100 Subject: comment a regexp that is not yet supported by all deployed munin versions --- templates/munin-node.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/munin-node.conf.erb b/templates/munin-node.conf.erb index 5e015d2..4448002 100644 --- a/templates/munin-node.conf.erb +++ b/templates/munin-node.conf.erb @@ -23,7 +23,7 @@ group <%= @group %> # timeout 60 # Regexps for files to ignore -ignore_file [\#~]$ +#ignore_file [\#~]$ ignore_file DEADJOE$ ignore_file \.bak$ ignore_file %$ -- cgit v1.2.3 From 695d81c81cd152b5dd7333d0eae2bd6df108a41e Mon Sep 17 00:00:00 2001 From: Arjen Heidinga Date: Fri, 31 Jan 2014 09:52:10 +0100 Subject: Add support for setting the descryption and group support --- templates/client.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/client.erb b/templates/client.erb index 83d5a64..5741701 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -9,9 +9,9 @@ # Registered on: <%= @h %> # Type: <%= @client_type %> <% if @description != 'absent' -%> -# Description: <%= @description.gsub!(/\n/, ' ') %> +# Description: <%= @description.gsub(/\n/, ' ') %> <% end -%> -[<%= @fhost.downcase %>] +[<% if @group != 'absent' -%><%= @group %>;<% end -%><%= @fhost.downcase %>] <% if @use_ssh -%> address ssh://<%= @host %>/bin/nc localhost <%= @port %> <% else -%> -- cgit v1.2.3 From b5cc9427aeca48689913b7462e58dd905c4a788b Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 3 Feb 2014 14:57:03 +0100 Subject: cleanup some of the missing parts --- templates/client.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/client.erb b/templates/client.erb index 5741701..bc42452 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -1,12 +1,12 @@ <% - # Downcase all information - dom = scope.lookupvar('::domain').downcase - h = scope.lookupvar('::hostname').downcase + # Downcase all information + dom = scope.lookupvar('::domain').downcase + h = scope.lookupvar('::hostname').downcase %> ### Munin client from Puppet template -# Domain: <%= @dom %> -# Registered on: <%= @h %> +# Domain: <%= dom %> +# Registered on: <%= h %> # Type: <%= @client_type %> <% if @description != 'absent' -%> # Description: <%= @description.gsub(/\n/, ' ') %> -- cgit v1.2.3 From d09774c635ea72932727d6724ee847942ddafb77 Mon Sep 17 00:00:00 2001 From: antonio Date: Wed, 9 Apr 2014 15:45:37 +0200 Subject: Configurable host_name variable --- templates/munin-node.conf.erb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates') diff --git a/templates/munin-node.conf.erb b/templates/munin-node.conf.erb index 4448002..891203c 100644 --- a/templates/munin-node.conf.erb +++ b/templates/munin-node.conf.erb @@ -34,7 +34,11 @@ 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 -- cgit v1.2.3 From 29919e02a8b3f27d9d516be586e92704b806a48e Mon Sep 17 00:00:00 2001 From: antonio Date: Thu, 12 Jun 2014 00:41:18 +0200 Subject: changed host_name default to ::fqdn --- templates/munin-node.conf.erb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'templates') 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 -- cgit v1.2.3 From acfaa47dbdb07805cb07eb72f552d0e9b03ba1c9 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Sat, 13 Dec 2014 11:21:09 -0500 Subject: create a single entry point to the module The current state of the module makes it impossible to install a munin server with munin::host, since it depends on resources in munin::client (because of the plugins it installs). Even if we include the munin::client class "just before" munin::host, puppet thinks there are dependency issues. By moving arguments to a single point of entry we can then include all necessary items and puppet will find the needed resources correctly. --- templates/munin-node.conf.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/munin-node.conf.erb b/templates/munin-node.conf.erb index b0c8fc8..f51a665 100644 --- a/templates/munin-node.conf.erb +++ b/templates/munin-node.conf.erb @@ -34,13 +34,13 @@ ignore_file \.pod$ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 # -host_name <%= scope.lookupvar('munin::client::host_name') %> +host_name <%= scope.lookupvar('munin::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 # 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| -%> +<% scope.lookupvar('munin::allow').each do |allow| -%> allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> @@ -56,7 +56,7 @@ allow <%= "^#{Regexp.escape(allow)}$" %> # cidr_deny 192.0.2.42/32 # Which address to bind to; -host <%= scope.lookupvar('munin::client::host') %> +host <%= scope.lookupvar('munin::host') %> # And which port -port <%= scope.lookupvar('munin::client::port') %> +port <%= scope.lookupvar('munin::port') %> -- cgit v1.2.3