From 057658ba93e2562c596dfa5607836679631be916 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
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.
---
 manifests/client/base.pp   |  4 ++--
 manifests/client/debian.pp |  3 ---
 manifests/client/params.pp | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 manifests/client/params.pp

(limited to 'manifests')

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'],
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index 63a0e14..f1bbb3c 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -12,9 +12,6 @@ class munin::client::debian inherits munin::client::base {
     # sarge's munin-node init script has no status
     hasstatus => $hasstatus
   }
-  File['/etc/munin/munin-node.conf']{
-    content => template("munin/munin-node.conf.${::operatingsystem}.${::lsbdistcodename}"),
-  }
   # workaround bug in munin_node_configure
   plugin { 'postfix_mailvolume': ensure => absent }
   include munin::plugins::debian
diff --git a/manifests/client/params.pp b/manifests/client/params.pp
new file mode 100644
index 0000000..14d3749
--- /dev/null
+++ b/manifests/client/params.pp
@@ -0,0 +1,19 @@
+# Set the parameters for the munin client
+class munin::client::params {
+  $user = 'root'
+
+  case $::operatingsystem {
+    'OpenBSD': {
+      $group = '0'
+      $log_file = '/var/log/munin-node/munin-node.log'
+    }
+    'Debian': {
+      $group = 'root'
+      $log_file = '/var/log/munin/munin-node.log'
+    }
+    default: {
+      $group = 'root'
+      $log_file = '/var/log/munin-node/munin-node.log'
+    }
+  }
+}
-- 
cgit v1.2.3


From 9bee8a31f2305dda884aeab3caf3bf91cd8603ba Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
Date: Tue, 2 Jul 2013 23:07:00 +0200
Subject: Unify logrotate files into templates

---
 manifests/host/cgi.pp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'manifests')

diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp
index 5b0ecbb..9951a48 100644
--- a/manifests/host/cgi.pp
+++ b/manifests/host/cgi.pp
@@ -30,13 +30,9 @@ class munin::host::cgi(
   }
 
   file{'/etc/logrotate.d/munin':
-    source => [ "puppet:///modules/site_munin/config/host/${::fqdn}/logrotate",
-                "puppet:///modules/site_munin/config/host/logrotate.${::operatingsystem}",
-                'puppet:///modules/site_munin/config/host/logrotate',
-                "puppet:///modules/munin/config/host/logrotate.${::operatingsystem}",
-                'puppet:///modules/munin/config/host/logrotate' ],
-    owner  => root,
-    group  => 0,
-    mode   => '0644',
+    content => template("${module_name}/logrotate.conf.erb"),
+    owner   => root,
+    group   => 0,
+    mode    => '0644',
   }
 }
-- 
cgit v1.2.3