Merge branch 'master' into leap

Conflicts:
	README
	manifests/host/cgi.pp

1 files changed, 14 insertions, 14 deletions

diff --git a/manifests/remoteplugin.pp b/manifests/remoteplugin.pp
index ce87492..603cb66 100644
--- a/manifests/remoteplugin.pp
+++ b/manifests/remoteplugin.pp
@@ -1,18 +1,18 @@
 define munin::remoteplugin($ensure = "present", $source, $config = '') {
-    case $ensure {
-        "absent": { munin::plugin{ $name: ensure => absent } }
-        default: {
-            file {
-                "/var/lib/puppet/modules/munin/plugins/${name}":
-                    source => $source,
-                    mode => 0755, owner => root, group => 0;
-            }
-            munin::plugin { $name:
-                ensure => $ensure,
-                config => $config,
-                script_path_in => "/var/lib/puppet/modules/munin/plugins",
-            }
-        }
+  case $ensure {
+    "absent": { munin::plugin{ $name: ensure => absent } }
+    default: {
+      file {
+        "/var/lib/puppet/modules/munin/plugins/${name}":
+          source => $source,
+          mode => 0755, owner => root, group => 0;
+      }
+      munin::plugin { $name:
+        ensure => $ensure,
+        config => $config,
+        script_path_in => "/var/lib/puppet/modules/munin/plugins",
+      }
     }
+  }
 }