X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=cad4319d73b5a9764258fdab90e178767c3d290f;hb=906277d3c7c09fa4437fdc4a87cab4b7896bfe67;hp=a3b92820ee3cf9ae2a1675de4dbe9532aeb28793;hpb=32ed1d575838c74dc2f6f94eda68d9ab5b3e7b0e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index a3b92820e..cad4319d7 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,17 +1,22 @@
 class monit {
-    package { "monit": ensure => installed;
-    }
+    package { "monit": ensure => installed }
 
     file {
+        "/etc/monit/":
+          ensure  => directory,
+          owner   => root,
+          group   => root,
+          mode    => 755,
+          purge   => true
+          ;
+
         "/etc/monit/monitrc":
-          source  => "puppet:///monit/monitrc",
+          content => template("monit/monitrc.erb"),
           require => Package["monit"],
-          notify  => Exec["monit restart"]
-          mode    => 440,
+          notify  => Exec["monit restart"],
+          mode    => 400
           ;
-    }
 
-    file {
         "/etc/monit/monit.d":
           ensure  => directory,
           owner   => root,
@@ -19,29 +24,23 @@ class monit {
           mode    => 750,
           purge   => true
           ;
-    }
 
-    file {
         "/etc/monit/monit.d/01puppet":
           source  => "puppet:///monit/puppet",
           require => Package["monit"],
-          notify  => Exec["monit restart"]
-          mode    => 440,
+          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,
+          notify  => Exec["monit restart"],
+          mode    => 440
           ;
-    }
 
-    file {
         "/etc/default/monit":
-          source  => "puppet:///monit/default",
+          content => template("monit/default.erb"),
           require => Package["monit"],
           notify  => Exec["monit restart"]
           ;
@@ -52,3 +51,6 @@ class monit {
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: