From 1fe2671e14411277863ed8132b213d0fb90b536e Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 13 Apr 2009 15:41:29 +0100 Subject: [PATCH] Mode 400 for monitrc and obligatory puppet headers Signed-off-by: Stephen Gran --- modules/monit/files/debianorg | 5 +++++ modules/monit/files/default | 5 +++++ modules/monit/files/monitrc | 4 ++++ modules/monit/files/puppet | 4 ++++ modules/monit/manifests/init.pp | 2 +- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/monit/files/debianorg b/modules/monit/files/debianorg index 97dada5c6..bf1f9be70 100644 --- 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 bf72a5a7d..afacfee2d 100644 --- 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 679587e9f..e18f5b849 100644 --- 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 5d3e21c27..37c728b28 100644 --- 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 7c8532381..5e1ebe084 100644 --- 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": -- 2.20.1