summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-17 16:36:37 -0400
committerMicah Anderson <micah@riseup.net>2013-04-17 16:36:37 -0400
commit8f7c0071eb82591477876eeb3f309067853a3261 (patch)
treeb095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /templates
parentea31faee76141646c173d88bd5bec5aa4a773c1c (diff)
parenta5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff)
Merge branch 'master' into leap
Conflicts: README manifests/host/cgi.pp
Diffstat (limited to 'templates')
-rw-r--r--templates/client.erb15
-rw-r--r--templates/munin-node.conf.Debian.etch10
-rw-r--r--templates/munin-node.conf.Debian.lenny10
l---------templates/munin-node.conf.Debian.lucid1
-rw-r--r--templates/munin-node.conf.Debian.wheezy10
-rw-r--r--[l---------]templates/munin-node.conf.OpenBSD60
-rw-r--r--templates/munin-node.conf.Ubuntu39
l---------templates/munin-node.conf.Ubuntu.precise1
l---------templates/munin-node.conf.Ubuntu.quantal1
-rw-r--r--templates/munin-node.conf.default27
10 files changed, 139 insertions, 35 deletions
diff --git a/templates/client.erb b/templates/client.erb
index 15e05c6..ba03da5 100644
--- a/templates/client.erb
+++ b/templates/client.erb
@@ -1,19 +1,24 @@
<%
# Downcase all information
- dom = domain.downcase
- host = hostname.downcase
+ dom = scope.lookupvar('::domain').downcase
+ h = scope.lookupvar('::hostname').downcase
%>
### Munin client from Puppet template
# Domain: <%= dom %>
-# Registered on: <%= host %>
+# Registered on: <%= h %>
# Type: <%= client_type %>
<% if description != 'absent' -%>
# Description: <%= description.gsub!(/\n/, ' ') %>
<% end -%>
[<%= fhost.downcase %>]
- address <%= munin_host_real %>
- port <%= munin_port_real %>
+<% if use_ssh -%>
+ address ssh://<%= host %>/bin/nc localhost <%= port %>
+<% else -%>
+ address <%= host %>
+ port <%= port %>
+<% end -%>
<% if config -%><% config.each do |val| -%>
<%= val -%>
<% end -%><% end -%>
+
diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch
index 56da89d..9763772 100644
--- a/templates/munin-node.conf.Debian.etch
+++ b/templates/munin-node.conf.Debian.etch
@@ -9,8 +9,8 @@ background 1
setseid 1
# Which host/port to bind to;
-host <%= munin_host_real %>
-port <%= munin_port_real %>
+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
-<% real_munin_allow.split(':').each do |val| -%>
-allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
+<% scope.lookupvar('munin::client::allow').each do |allow| -%>
+allow <%= "^#{Regexp.escape(allow)}$" %>
<% end -%>
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny
index 56da89d..9763772 100644
--- a/templates/munin-node.conf.Debian.lenny
+++ b/templates/munin-node.conf.Debian.lenny
@@ -9,8 +9,8 @@ background 1
setseid 1
# Which host/port to bind to;
-host <%= munin_host_real %>
-port <%= munin_port_real %>
+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
-<% real_munin_allow.split(':').each do |val| -%>
-allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
+<% 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
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Debian.lucid
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch \ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.wheezy b/templates/munin-node.conf.Debian.wheezy
index 2b5d41f..fe6f27f 100644
--- a/templates/munin-node.conf.Debian.wheezy
+++ b/templates/munin-node.conf.Debian.wheezy
@@ -27,15 +27,15 @@ 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
# network notation unless the perl module Net::CIDR is installed. You
# may repeat the allow line as many times as you'd like
-<% real_munin_allow.split(':').each do |val| -%>
-allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
+<% 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
@@ -50,8 +50,8 @@ allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
# cidr_deny 192.0.2.42/32
# Which address to bind to;
-host <%= munin_host_real %>
+host <%= scope.lookupvar('munin::client::host') %>
# And which port
-port <%= munin_port_real %>
+port <%= scope.lookupvar('munin::client::port') %>
diff --git a/templates/munin-node.conf.OpenBSD b/templates/munin-node.conf.OpenBSD
index 082b30c..14b658e 120000..100644
--- a/templates/munin-node.conf.OpenBSD
+++ b/templates/munin-node.conf.OpenBSD
@@ -1 +1,59 @@
-munin-node.conf.default \ No newline at end of file
+##########
+########## 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
new file mode 100644
index 0000000..9763772
--- /dev/null
+++ b/templates/munin-node.conf.Ubuntu
@@ -0,0 +1,39 @@
+##########
+########## 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
new file mode 120000
index 0000000..d8fcb24
--- /dev/null
+++ b/templates/munin-node.conf.Ubuntu.precise
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..d8fcb24
--- /dev/null
+++ b/templates/munin-node.conf.Ubuntu.quantal
@@ -0,0 +1 @@
+munin-node.conf.Ubuntu \ No newline at end of file
diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index e584df1..9d7f32f 100644
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -6,7 +6,7 @@
#
log_level 4
-log_file /var/log/munin/munin-node.log
+log_file /var/log/munin-node/munin-node.log
pid_file /var/run/munin/munin-node.pid
background 1
@@ -16,9 +16,7 @@ user root
group 0
# Regexps for files to ignore
-
-ignore_file ~$
-#ignore_file [#~]$ # FIX doesn't work. '#' starts a comment
+ignore_file [\#~]$
ignore_file DEADJOE$
ignore_file \.bak$
ignore_file %$
@@ -37,24 +35,25 @@ host_name <%= fqdn %>
# network notation unless the perl module Net::CIDR is installed. You
# may repeat the allow line as many times as you'd like
-<% real_munin_allow.split(':').each do |val| -%>
-allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
+<% 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
-# multiple cidr_allow and cidr_deny address/mask patterns. A
-# connecting client must match any cidr_allow, and not match any
-# cidr_deny. Example:
-
+# 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 <%= munin_host_real %>
+host <%= scope.lookupvar('munin::client::host') %>
# host 127.0.0.1
# And which port
-port <%= munin_port_real %>
+port <%= scope.lookupvar('munin::client::port') %>