Mode 400 for monitrc and obligatory puppet headers

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

diff --git a/modules/monit/files/debianorg b/modules/monit/files/debianorg
index 97dada5c671622b3698ffe5e5ae8bb90159bc311..bf1f9be70a9e4c5b5b10b67eaf68061b5b69b4ed 100644 (file)
--- a/modules/monit/files/debianorg
+++ b/modules/monit/files/debianorg
@@ -1,2 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 set alert samhain-reports@debian.org
 set mail-format { from: monit@debian.org }

diff --git a/modules/monit/files/default b/modules/monit/files/default
index bf72a5a7d298e656b0a944f5ea2b8b75e04f36af..afacfee2d4c719db6d5a76f00746c0567151f901 100644 (file)
--- a/modules/monit/files/default
+++ b/modules/monit/files/default
@@ -1,3 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 # Defaults for monit initscript
 # sourced by /etc/init.d/monit
 # installed at /etc/default/monit by maintainer scripts

diff --git a/modules/monit/files/monitrc b/modules/monit/files/monitrc
index 679587e9fa8bfdcd62dc7749483d66bcbba9d98c..e18f5b849a0c0bafb1bdf31077ab4bb80f145cd3 100644 (file)
--- a/modules/monit/files/monitrc
+++ b/modules/monit/files/monitrc
@@ -1,3 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
 ###############################################################################
 ## Monit control file
 ###############################################################################

diff --git a/modules/monit/files/puppet b/modules/monit/files/puppet
index 5d3e21c273ab26971e82d37973750d4f5ce5d2cf..37c728b281523446512a671f9ff1aadc6bfe5fa9 100644 (file)
--- a/modules/monit/files/puppet
+++ b/modules/monit/files/puppet
@@ -1,3 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
 check process puppetd with pidfile /var/run/puppet/puppetd.pid
     start program = "/etc/init.d/puppet start"
     stop program  = "/etc/init.d/puppet stop"

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 7c85323815fedfa27674c4fe3e3d1d88d25a5ca3..5e1ebe084d058c69198ec661ba8f593ed0ba5765 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -14,7 +14,7 @@ class monit {
           source  => "puppet:///monit/monitrc",
           require => Package["monit"],
           notify  => Exec["monit restart"],
-          mode    => 440
+          mode    => 400
           ;
 
         "/etc/monit/monit.d":