X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=b7e909d1cebd3b8f7345a36c9722182eb815ed5b;hb=f3878ee32e4159ff315d96b980a1aec9cb4da82a;hp=430d37170239ee771ded44e35002e515e2c11baf;hpb=b222c3187ec6339ec3bb062717f2e59a36d2d9fb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 430d37170..b7e909d1c 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -2,11 +2,19 @@ class monit {
     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
           ;
 
         "/etc/monit/monit.d":
@@ -20,19 +28,19 @@ class monit {
         "/etc/monit/monit.d/01puppet":
           source  => "puppet:///monit/puppet",
           require => Package["monit"],
-          notify  => Exec["monit restart"]
+          notify  => Exec["monit restart"],
           mode    => 440
           ;
 
         "/etc/monit/monit.d/00debian.org":
           source  => "puppet:///monit/debianorg",
           require => Package["monit"],
-          notify  => Exec["monit restart"]
+          notify  => Exec["monit restart"],
           mode    => 440
           ;
 
         "/etc/default/monit":
-          source  => "puppet:///monit/default",
+          content => template("monit/default.erb"),
           require => Package["monit"],
           notify  => Exec["monit restart"]
           ;