another try to fix this problem
authormh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Fri, 25 Apr 2008 10:43:41 +0000 (10:43 +0000)
committermh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Fri, 25 Apr 2008 10:43:41 +0000 (10:43 +0000)
git-svn-id: https://svn/ipuppet/trunk/modules/munin@1261 d66ca3ae-40d7-4aa7-90d4-87d79ca94279

manifests/client.pp

index 08fc3ba..2208b8d 100644 (file)
@@ -59,7 +59,7 @@ class munin::client::base {
                        ensure => directory,
                        mode => 0755, owner => root, group => 0;
                "/etc/munin/munin-node.conf":
-                       content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"),
+                       content => template("munin/munin-node.conf.$operatingsystem"),
                        mode => 0644, owner => root, group => 0,
                        # this has to be installed before the package, so the postinst can
                        # boot the munin-node without failure!
@@ -99,6 +99,9 @@ class munin::client::debian inherits munin::client::base {
                # sarge's munin-node init script has no status
                hasstatus => $lsbdistcodename ? { sarge => false, default => true }
        }
+    File["/etc/munin/munin-node.conf"]{
+                       content => template("munin/munin-node.conf.$operatingsystem"),
+    }
        # workaround bug in munin_node_configure
        plugin { "postfix_mailvolume": ensure => absent }
        include munin::plugins::debian
@@ -111,9 +114,7 @@ class munin::client::gentoo inherits munin::client::base {
         name => 'munin',
         category => 'net-analyzer',
     }
-    File["/etc/munin/munin-node.conf"]{
-                       content => template("munin/munin-node.conf.$operatingsystem"),
-    }
+    
 
        include munin::plugins::gentoo
 }