From: Stephen Gran <steve@lobefin.net>
Date: Mon, 13 Apr 2009 13:05:19 +0000 (+0100)
Subject: manifest_s_, Steve
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=32ed1d575838c74dc2f6f94eda68d9ab5b3e7b0e;p=mirror%2Fdsa-puppet.git

manifest_s_, Steve
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/monit/manifest/init.pp b/modules/monit/manifest/init.pp
deleted file mode 100644
index a3b92820e..000000000
--- a/modules/monit/manifest/init.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-class monit {
-    package { "monit": ensure => installed;
-    }
-
-    file {
-        "/etc/monit/monitrc":
-          source  => "puppet:///monit/monitrc",
-          require => Package["monit"],
-          notify  => Exec["monit restart"]
-          mode    => 440,
-          ;
-    }
-
-    file {
-        "/etc/monit/monit.d":
-          ensure  => directory,
-          owner   => root,
-          group   => root,
-          mode    => 750,
-          purge   => true
-          ;
-    }
-
-    file {
-        "/etc/monit/monit.d/01puppet":
-          source  => "puppet:///monit/puppet",
-          require => Package["monit"],
-          notify  => Exec["monit restart"]
-          mode    => 440,
-          ;
-    }
-
-    file {
-        "/etc/monit/monit.d/00debian.org":
-          source  => "puppet:///monit/debianorg",
-          require => Package["monit"],
-          notify  => Exec["monit restart"]
-          mode    => 440,
-          ;
-    }
-
-    file {
-        "/etc/default/monit":
-          source  => "puppet:///monit/default",
-          require => Package["monit"],
-          notify  => Exec["monit restart"]
-          ;
-    }
-    exec { "monit restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-}
-
diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
new file mode 100644
index 000000000..a3b92820e
--- /dev/null
+++ b/modules/monit/manifests/init.pp
@@ -0,0 +1,54 @@
+class monit {
+    package { "monit": ensure => installed;
+    }
+
+    file {
+        "/etc/monit/monitrc":
+          source  => "puppet:///monit/monitrc",
+          require => Package["monit"],
+          notify  => Exec["monit restart"]
+          mode    => 440,
+          ;
+    }
+
+    file {
+        "/etc/monit/monit.d":
+          ensure  => directory,
+          owner   => root,
+          group   => root,
+          mode    => 750,
+          purge   => true
+          ;
+    }
+
+    file {
+        "/etc/monit/monit.d/01puppet":
+          source  => "puppet:///monit/puppet",
+          require => Package["monit"],
+          notify  => Exec["monit restart"]
+          mode    => 440,
+          ;
+    }
+
+    file {
+        "/etc/monit/monit.d/00debian.org":
+          source  => "puppet:///monit/debianorg",
+          require => Package["monit"],
+          notify  => Exec["monit restart"]
+          mode    => 440,
+          ;
+    }
+
+    file {
+        "/etc/default/monit":
+          source  => "puppet:///monit/default",
+          require => Package["monit"],
+          notify  => Exec["monit restart"]
+          ;
+    }
+    exec { "monit restart":
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+        refreshonly => true,
+    }
+}
+