summaryrefslogtreecommitdiff
path: root/manifests/client/base.pp
diff options
context:
space:
mode:
authorEwoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>2013-07-02 22:49:02 +0200
committerEwoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>2013-11-20 14:34:32 +0100
commit057658ba93e2562c596dfa5607836679631be916 (patch)
tree43d9398cbcd950553f59676a36740ffe316999ad /manifests/client/base.pp
parent99782a1f6446e5fee1670e832f22731aef77d2f6 (diff)
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.
Diffstat (limited to 'manifests/client/base.pp')
-rw-r--r--manifests/client/base.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index e81028d..71531fa 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,5 +1,5 @@
# Install a basic munin client
-class munin::client::base {
+class munin::client::base inherits munin::client::params {
package { 'munin-node':
ensure => installed
}
@@ -17,7 +17,7 @@ class munin::client::base {
group => 0,
}
file {'/etc/munin/munin-node.conf':
- content => template("munin/munin-node.conf.${::operatingsystem}"),
+ content => template("${module_name}/munin-node.conf.erb"),
# this has to be installed before the package, so the postinst can
# boot the munin-node without failure!
before => Package['munin-node'],