From 641873546ffe6c8ccbef06a6b66fd40892613d48 Mon Sep 17 00:00:00 2001 From: Jan Krause Date: Wed, 9 Dec 2015 16:04:28 +0100 Subject: [PATCH] minor changes --- manifests/config.pp | 3 +-- manifests/init.pp | 2 +- manifests/plugin.pp | 4 ++-- manifests/plugin/gem.pp | 2 +- manifests/service.pp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 13f2b96..a50e69a 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,4 +1,4 @@ -# Configure package +# Configure config files/directories # class fluentd::config inherits fluentd { @@ -16,5 +16,4 @@ class fluentd::config inherits fluentd { group => $::fluentd::user_group, mode => '0750', } - } diff --git a/manifests/init.pp b/manifests/init.pp index 87a7684..b5622a9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -64,6 +64,7 @@ class fluentd ( validate_bool($service_manage) validate_string($service_name) validate_bool($service_enable) + if ! ($service_ensure in [ 'running', 'stopped' ]) { fail('service_ensure parameter must be running or stopped') } @@ -79,5 +80,4 @@ class fluentd ( Class['::Fluentd::Install'] -> Class['::Fluentd::Config'] -> Class['::Fluentd::Service'] - } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index df6b3c4..c67dd1e 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -40,7 +40,7 @@ define fluentd::plugin ( 'gem': { fluentd::plugin::gem { $name: ensure => $ensure, - require => Class['Fluentd::Install'] + require => Class['Fluentd::Install'], } } 'file': { @@ -49,7 +49,7 @@ define fluentd::plugin ( fluentd::plugin::file { $name: ensure => $ensure, source => $source, - require => Class['Fluentd::Install'] + require => Class['Fluentd::Install'], } } default: { diff --git a/manifests/plugin/gem.pp b/manifests/plugin/gem.pp index 5643f4f..dfc141c 100644 --- a/manifests/plugin/gem.pp +++ b/manifests/plugin/gem.pp @@ -11,6 +11,6 @@ define fluentd::plugin::gem ( package { $name: ensure => $ensure, provider => 'fluentd_gem', - notify => Class['Fluentd::Service'] + notify => Class['Fluentd::Service'], } } diff --git a/manifests/service.pp b/manifests/service.pp index 2c13407..a04eec3 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,4 +1,4 @@ -# Configure package +# Configure service # class fluentd::service inherits fluentd {