7 files changed, 32 insertions, 20 deletions
diff --git a/modules/munin/files/master.conf b/modules/munin/files/master.conf
deleted file mode 100644
index 2f42957..0000000
--- a/modules/munin/files/master.conf
+++ /dev/null
@@ -1 +0,0 @@
-htmldir /srv/http/munin
diff --git a/modules/munin/files/munin-node.conf b/modules/munin/files/munin-node.conf
new file mode 100644
index 0000000..c8f4e38
--- /dev/null
+++ b/modules/munin/files/munin-node.conf
@@ -0,0 +1,23 @@
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /run/munin/munin-node.pid
+
+background 1
+setsid 1
+
+user root
+group root
+
+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$
+
+allow ^127\.0\.0\.1$
+allow ^138\.197\.58\.11$
+
+host *
+port 4949
diff --git a/modules/munin/files/munin.conf b/modules/munin/files/munin.conf
index 16d4983..1780981 100644
--- a/modules/munin/files/munin.conf
+++ b/modules/munin/files/munin.conf
@@ -1 +1,5 @@
-includedir /etc/munin/munin-conf.d
+htmldir /srv/http/munin
+
+[tozt]
+    address 127.0.0.1
+    use_node_name yes
diff --git a/modules/munin/manifests/conf.pp b/modules/munin/manifests/conf.pp
deleted file mode 100644
index 182d065..0000000
--- a/modules/munin/manifests/conf.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class munin::conf {
-  file { '/etc/munin/munin.conf':
-    source => 'puppet:///modules/munin/munin.conf';
-  }
-}
diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 7f6951c..970fa21 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -1,8 +1,5 @@
 class munin {
-  include munin::conf
-
   package { 'munin':
-    before => Class['munin::conf'];
   }
 
   file {
@@ -11,8 +8,8 @@ class munin {
       owner => 'munin',
       group => 'munin',
       require => Package['munin'];
-    '/etc/munin/munin-conf.d/master':
-      source => 'puppet:///modules/munin/master.conf',
+    '/etc/munin/munin.conf':
+      source => 'puppet:///modules/munin/munin.conf',
       require => Package['munin'];
   }
 
diff --git a/modules/munin/manifests/node.pp b/modules/munin/manifests/node.pp
index a428cd1..d83393b 100644
--- a/modules/munin/manifests/node.pp
+++ b/modules/munin/manifests/node.pp
@@ -1,8 +1,5 @@
 class munin::node {
-  include munin::conf
-
   package { 'munin-node':
-    before => Class['munin::conf'];
   }
 
   service { 'munin-node':
@@ -14,8 +11,8 @@ class munin::node {
     ];
   }
 
-  file { '/etc/munin/munin-conf.d/node':
-    content => template('munin/node.conf'),
+  file { '/etc/munin/munin-node.conf':
+    source => 'puppet:///modules/munin/munin-node.conf',
     require => Package['munin-node'];
   }
 }
diff --git a/modules/munin/templates/node.conf b/modules/munin/templates/node.conf
deleted file mode 100644
index 12297d0..0000000
--- a/modules/munin/templates/node.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[<%= @hostname %>]
-    address 127.0.0.1
-    use_node_name yes