From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 28 Feb 2010 20:10:10 +0000 (+0100)
Subject: bad puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e1b0adaaa36ee0c5de7e7512a04247778850b164;p=dsa-puppet.git

bad puppet
---

diff --git a/manifests/site.pp b/manifests/site.pp
index b078599e..513d1ff1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,7 +43,7 @@ node default {
         "true":    { package { acpid: ensure => installed } }
     }
     case $mptraid {
-        "true":    { include "raid-mpt" }
+        "true":    { include "raidmpt" }
     }
 
     case $mta {
diff --git a/modules/raid-mpt/manifest/init.pp b/modules/raid-mpt/manifest/init.pp
deleted file mode 100644
index 206f926b..00000000
--- a/modules/raid-mpt/manifest/init.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class "raid-mpt" {
-    package {
-        mtp-status: ensure => installed;
-    }
-
-    file {
-        "/etc/default/mpt-statusd":
-            content =>  "# This file is under puppet control" +
-                        "RUN_DAEMON=no",
-            notify  => Exec["mpt-statusd-stop"],
-            ;
-    }
-    exec {
-        "mpt-statusd-stop":
-            command: 'pidfile=/var/run/mpt-statusd.pid; ! [ -e "$pidfile" ] || /sbin/start-stop-daemon --oknodo --stop --quiet --pidfile "$pidfile"; rm -f "$pidfile"'
-            refreshonly => true,
-            ;
-    }
-}
-# vim:set et:
-# vim:set ts=4:
-# vim:set shiftwidth=4:
diff --git a/modules/raidmpt/manifest/init.pp b/modules/raidmpt/manifest/init.pp
new file mode 100644
index 00000000..2aa4ac79
--- /dev/null
+++ b/modules/raidmpt/manifest/init.pp
@@ -0,0 +1,22 @@
+class raidmpt {
+    package {
+        mtp-status: ensure => installed;
+    }
+
+    file {
+        "/etc/default/mpt-statusd":
+            content =>  "# This file is under puppet control" +
+                        "RUN_DAEMON=no",
+            notify  => Exec["mpt-statusd-stop"],
+            ;
+    }
+    exec {
+        "mpt-statusd-stop":
+            command: 'pidfile=/var/run/mpt-statusd.pid; ! [ -e "$pidfile" ] || /sbin/start-stop-daemon --oknodo --stop --quiet --pidfile "$pidfile"; rm -f "$pidfile"'
+            refreshonly => true,
+            ;
+    }
+}
+# vim:set et:
+# vim:set ts=4:
+# vim:set shiftwidth=4: