summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Zieger <me@saz.sh>2013-02-02 01:23:58 +0100
committerSteffen Zieger <me@saz.sh>2013-02-02 01:23:58 +0100
commita0bfb6784fc64f8873ddbfe09a658caf9a84923f (patch)
treec864d5ae4c3de761b6e1c635fc2bab1bd785900e
parentab10242f55b8e4f1a33825f46bcd086334a4dba2 (diff)
whitespace consistency
fixes #18
-rw-r--r--manifests/config.pp2
-rw-r--r--manifests/database.pp1
-rw-r--r--manifests/imfile.pp2
-rw-r--r--manifests/install.pp2
-rw-r--r--manifests/params.pp2
-rw-r--r--manifests/service.pp2
-rw-r--r--manifests/snippet.pp2
7 files changed, 13 insertions, 0 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 886321d..31b95bd 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -11,6 +11,7 @@
# class { 'rsyslog::config': }
#
class rsyslog::config inherits rsyslog::params {
+
file { $rsyslog::params::rsyslog_d:
ensure => directory,
owner => 'root',
@@ -46,4 +47,5 @@ class rsyslog::config inherits rsyslog::params {
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
}
+
}
diff --git a/manifests/database.pp b/manifests/database.pp
index 8046d2a..b406bba 100644
--- a/manifests/database.pp
+++ b/manifests/database.pp
@@ -53,4 +53,5 @@ class rsyslog::database (
require => Class['rsyslog::config'],
notify => Class['rsyslog::service'],
}
+
}
diff --git a/manifests/imfile.pp b/manifests/imfile.pp
index 58554a4..c4308d7 100644
--- a/manifests/imfile.pp
+++ b/manifests/imfile.pp
@@ -29,6 +29,7 @@ define rsyslog::imfile(
$file_severity = 'notice',
$run_file_monitor = true
) {
+
include rsyslog::params
file { "${rsyslog::params::rsyslog_d}${name}.conf":
@@ -39,4 +40,5 @@ define rsyslog::imfile(
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
}
+
}
diff --git a/manifests/install.pp b/manifests/install.pp
index 445a87b..7d09405 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -11,6 +11,7 @@
# class { 'rsyslog::install': }
#
class rsyslog::install inherits rsyslog::params {
+
package { $rsyslog::params::rsyslog_package_name:
ensure => $rsyslog::params::package_status,
}
@@ -18,4 +19,5 @@ class rsyslog::install inherits rsyslog::params {
package { $rsyslog::params::relp_package_name:
ensure => $rsyslog::params::package_status
}
+
}
diff --git a/manifests/params.pp b/manifests/params.pp
index 7df9aab..f580d2e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,6 +11,7 @@
# class { 'rsyslog::params': }
#
class rsyslog::params {
+
case $::osfamily {
debian: {
$rsyslog_package_name = 'rsyslog'
@@ -84,4 +85,5 @@ class rsyslog::params {
}
}
}
+
}
diff --git a/manifests/service.pp b/manifests/service.pp
index cbdaa16..9826b4a 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -11,9 +11,11 @@
# class { 'rsyslog::service': }
#
class rsyslog::service inherits rsyslog::params {
+
service { $rsyslog::params::service_name:
ensure => running,
enable => true,
require => Class['rsyslog::config'],
}
+
}
diff --git a/manifests/snippet.pp b/manifests/snippet.pp
index 38e71d4..79f225e 100644
--- a/manifests/snippet.pp
+++ b/manifests/snippet.pp
@@ -19,6 +19,7 @@ define rsyslog::snippet(
$content,
$ensure = 'present'
) {
+
include rsyslog
file { "${rsyslog::params::rsyslog_d}${name}.conf":
@@ -29,4 +30,5 @@ define rsyslog::snippet(
require => Class['rsyslog::config'],
notify => Class['rsyslog::service'],
}
+
}