merged munin-module with davids
authormh <mh@immerda.ch>
Sat, 29 Mar 2008 14:47:43 +0000 (14:47 +0000)
committermh <mh@immerda.ch>
Sat, 29 Mar 2008 14:47:43 +0000 (14:47 +0000)
manifests/client.pp
manifests/host.pp
plugins/puppet/parser/functions/muninport.rb [deleted file]

index dbf175a..c81e6f4 100644 (file)
@@ -74,6 +74,7 @@ define munin::register_snmp()
        @@file { "munin_snmp_${name}": path => "${NODESDIR}/${name}",
                ensure => present,
                content => template("munin/snmpclient.erb"),
+        tag => 'munin',
        }
 }
 
index 844698d..286f5ee 100644 (file)
@@ -6,12 +6,19 @@ class munin::host
 {
        package { [ "munin", "nmap"]: ensure => installed, }
 
-       File <<||>>
+       File <<| tag == 'munin' |>>
 
        concatenated_file { "/etc/munin/munin.conf":
                dir => $NODESDIR,
                header => "/etc/munin/munin.conf.header",
        }
+
+    file { ["/var/log/munin-update.log", "/var/log/munin-limits.log", 
+               "/var/log/munin-graph.log", "/var/log/munin-html.log"]:
+        ensure => present,
+        mode => 640, owner => munin, group => 0;
+    }
+
        
 }
 
diff --git a/plugins/puppet/parser/functions/muninport.rb b/plugins/puppet/parser/functions/muninport.rb
deleted file mode 100644 (file)
index d0b5909..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# immerda 
-module Puppet::Parser::Functions
-    newfunction(:muninport, :type => :rvalue) do |args|
-        args[0]+65400
-    end
-end
-