get rid of obvious changes

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

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 1532f9f38a17243e47f64e832a7f8c3066940725..073b0a4b2eeccc144c757d1ce5e1a19af47ca662 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -238,7 +238,7 @@ REJECT reject-with icmp-admin-prohibited
                default: {}
        }
 
-       if $::rsyncd == true {
+       if $::rsyncd {
                include ferm::rsync
        }
 }

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 4c9b736bd49706076879956b4caf80a61253ca69..8b29f48de63427ee4dd150892dbecf9b1f3b45cd 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -19,7 +19,7 @@ class monit {
                notify => Exec['init q'],
        }
 
-       file { [ '/etc/monit/', '/etc/monit/monit.d']:
+       file { '/etc/monit/':
                ensure  => directory,
                owner   => root,
                group   => root,
@@ -28,6 +28,13 @@ class monit {
                notify  => Exec['monit stop'],
                require => Package['monit'],
        }
+       file { '/etc/monit/monit.d':
+               ensure  => directory,
+               owner   => root,
+               group   => root,
+               mode    => '0750',
+               purge   => true,
+       }
        file { '/etc/monit/monitrc':
                content => template('monit/monitrc.erb'),
                mode    => '0400'

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index a2482290da7c1ae8386447d752eff09d2a6508e7..7b8927de304a646d6f8b3b23a1c57b0b0deafe8e 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -36,6 +36,7 @@ class nagios::client inherits nagios {
        }
        file { '/etc/nagios/':
                ensure  => directory,
+               mode    => '0755',
                require => Package['nagios-nrpe-server'],
                notify  => Service['nagios-nrpe-server'],
        }