merged with davids and removed a case statement, which made no sense
authormh <mh@immerda.ch>
Tue, 8 Jul 2008 18:41:55 +0000 (18:41 +0000)
committermh <mh@immerda.ch>
Tue, 8 Jul 2008 18:41:55 +0000 (18:41 +0000)
files/modules_dir/.ignore [new file with mode: 0644]
manifests/plugin.pp

diff --git a/files/modules_dir/.ignore b/files/modules_dir/.ignore
new file mode 100644 (file)
index 0000000..e69de29
index 76d12a0..2c64482 100644 (file)
@@ -134,35 +134,18 @@ define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') {
 ### clases for plugins
 
 class munin::plugins::base {
-       case $operatingsystem {
-               centos: {               
-                   file {
-                       [ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-                               source => "puppet://$server/munin/empty",
-                               ensure => directory, checksum => mtime,
-                               recurse => true, purge => true, force => true, 
-                               mode => 0755, owner => root, group => 0;
-                       "/etc/munin/plugin-conf.d/munin-node":
-                               ensure => present, 
-                               mode => 0644, owner => root, group => 0;
-                   }
-               }
-
-               default: {
-                   file {
-                       [ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
-                               source => "puppet://$server/munin/empty",
-                               ensure => directory, checksum => mtime,
-                               recurse => true, purge => true, force => true, 
-                               mode => 0755, owner => root, group => 0,
-                               notify => Service['munin-node'];
-                       "/etc/munin/plugin-conf.d/munin-node":
-                               ensure => present, 
-                               mode => 0644, owner => root, group => 0,
-                               notify => Service['munin-node'],
-                before => Package['munin-node'];
-                   }
-               }
+    file {
+           [ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
+               source => "puppet://$server/common/empty",
+                       ensure => directory, checksum => mtime,
+                       recurse => true, purge => true, force => true, 
+                       mode => 0755, owner => root, group => 0,
+                       notify => Service['munin-node'];
+               "/etc/munin/plugin-conf.d/munin-node":
+                       ensure => present, 
+                       mode => 0644, owner => root, group => 0,
+                       notify => Service['munin-node'],
+            before => Package['munin-node'];
        }
     case $kernel {
         linux: {