diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-06-02 14:42:03 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-06-02 14:42:03 -0300 |
commit | 0b5031e7995a0ab7e985cfced38485b7f8872ffa (patch) | |
tree | a352395683da6bc6c328710ca1791306be856a96 | |
parent | 6045af9b79466e9ae5de87db64f7ddb183dfe3e9 (diff) | |
download | puppet-syslog-ng-0b5031e7995a0ab7e985cfced38485b7f8872ffa.tar.gz puppet-syslog-ng-0b5031e7995a0ab7e985cfced38485b7f8872ffa.tar.bz2 |
Adds ensure param
-rw-r--r-- | manifests/init.pp | 17 | ||||
-rw-r--r-- | manifests/vserver.pp | 9 |
2 files changed, 16 insertions, 10 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 605dd4d..f3c4836 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,22 +17,23 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. class syslog-ng( - $log_kernel_msgs = hiera('syslog-ng::log_kernel_msgs', true) + $log_kernel_msgs = hiera('syslog-ng::log_kernel_msgs', true), + $ensure = 'present' ) { # see https://bugs.launchpad.net/ubuntu/+source/syslog-ng/+bug/1242173 package { 'syslog-ng-core': - ensure => installed, + ensure => $ensure, } package { 'syslog-ng': - ensure => installed, + ensure => $ensure, require => Package['syslog-ng-core'], } # syslog-ng service service { "syslog-ng": enable => true, - ensure => running, + ensure => $ensure, hasrestart => true, hasstatus => false, # Somehow syslog-ng is not returning if it was killed due to lack of @@ -49,17 +50,19 @@ class syslog-ng( owner => "root", group => "root", mode => 0644, - ensure => present, + ensure => $ensure, notify => Service["syslog-ng"], require => File["/etc/syslog-ng"], } # config folder file { "/etc/syslog-ng": - ensure => directory, + ensure => $ensure ? { + 'present' => directory, + default => absent, + }, owner => "root", group => "root", require => Package["syslog-ng"], } - } diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 0c1e344..6fc51a4 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -1,8 +1,11 @@ -class syslog-ng::vserver { +class syslog-ng::vserver( + $ensure = 'present' +) { # syslog-ng class for vservers # where is not possible to log kernel msgs class { 'syslog-ng': log_kernel_msgs => false, + ensure => $ensure, } # Manage this file due to @@ -12,7 +15,7 @@ class syslog-ng::vserver { owner => "root", group => "root", mode => 0644, - ensure => present, + ensure => $ensure, source => "puppet:///modules/syslog-ng/logrotate", } @@ -23,7 +26,7 @@ class syslog-ng::vserver { owner => "root", group => "root", mode => 0644, - ensure => present, + ensure => $ensure, source => "puppet:///modules/syslog-ng/default", notify => Service["syslog-ng"], } |