summaryrefslogtreecommitdiff
path: root/manifests/config.pp
diff options
context:
space:
mode:
authorMathieu Bornoz <mathieu.bornoz@camptocamp.com>2013-04-29 12:33:46 +0200
committerMathieu Bornoz <mathieu.bornoz@camptocamp.com>2013-04-29 12:33:46 +0200
commita726b4045442fe2219353fb983d650fcd94b13be (patch)
tree37e5ddb4f8ac5083f000a189d358e66e2b36ab7f /manifests/config.pp
parent08c49965861137ae79620c7ca82af572f0ef024f (diff)
rsyslog: make all module params configurable
+ support false for *_package_name variables. This is useful if relp support is not necessary as it happens that no packages exist for RedHat < 6. All these changes should be fully backward compatible.
Diffstat (limited to 'manifests/config.pp')
-rw-r--r--manifests/config.pp21
1 files changed, 10 insertions, 11 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 31b95bd..d7fbbe6 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -10,40 +10,39 @@
#
# class { 'rsyslog::config': }
#
-class rsyslog::config inherits rsyslog::params {
-
- file { $rsyslog::params::rsyslog_d:
+class rsyslog::config {
+ file { $rsyslog::rsyslog_d:
ensure => directory,
owner => 'root',
- group => $rsyslog::params::run_group,
- purge => $rsyslog::params::purge_rsyslog_d,
+ group => $rsyslog::run_group,
+ purge => $rsyslog::purge_rsyslog_d,
recurse => true,
force => true,
require => Class['rsyslog::install'],
}
- file { $rsyslog::params::rsyslog_conf:
+ file { $rsyslog::rsyslog_conf:
ensure => file,
owner => 'root',
- group => $rsyslog::params::run_group,
+ group => $rsyslog::run_group,
content => template("${module_name}/rsyslog.conf.erb"),
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
}
- file { $rsyslog::params::rsyslog_default:
+ file { $rsyslog::rsyslog_default:
ensure => file,
owner => 'root',
- group => $rsyslog::params::run_group,
+ group => $rsyslog::run_group,
source => 'puppet:///modules/rsyslog/rsyslog_default',
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
}
- file { $rsyslog::params::spool_dir:
+ file { $rsyslog::spool_dir:
ensure => directory,
owner => 'root',
- group => $rsyslog::params::run_group,
+ group => $rsyslog::run_group,
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
}