Merge branch 'immerda/master'

Conflicts:
	files/plugins/xen-cpu
	templates/munin-node.conf.Debian.squeeze

1 files changed, 11 insertions, 11 deletions

diff --git a/manifests/snmp_collector.pp b/manifests/snmp_collector.pp
index 7bd8bba..0f8318a 100644
--- a/manifests/snmp_collector.pp
+++ b/manifests/snmp_collector.pp
@@ -1,14 +1,14 @@
 class munin::snmp_collector{
-    file {
-        "/var/lib/puppet/modules/munin/create_snmp_links":
-            source => "puppet:///modules/munin/create_snmp_links.sh",
-            mode => 755, owner => root, group => 0;
-    }
+	file { 
+		"/var/lib/puppet/modules/munin/create_snmp_links":
+			source => "puppet:///modules/munin/create_snmp_links.sh",
+			mode => 755, owner => root, group => 0;
+	}
 
-    exec { "create_snmp_links":
-        command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes",
-        require => File["snmp_links"],
-        timeout => "2048",
-        schedule => daily
-    }
+  exec { "create_snmp_links":
+    command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes",
+    require => File["snmp_links"],
+    timeout => "2048",
+    schedule => daily
+  }
 }