From ae040bee3562b2253cf41ac45e3ea59f031ee53f Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Thu, 5 Apr 2012 14:01:27 +0100 Subject: [PATCH] get rid of obvious changes Signed-off-by: Stephen Gran --- modules/ferm/manifests/per-host.pp | 2 +- modules/monit/manifests/init.pp | 9 ++++++++- modules/nagios/manifests/client.pp | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 1532f9f38..073b0a4b2 100644 --- 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 4c9b736bd..8b29f48de 100644 --- 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 a2482290d..7b8927de3 100644 --- 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'], } -- 2.20.1