diff options
author | Steffen Zieger <me@saz.sh> | 2013-05-10 05:26:58 -0700 |
---|---|---|
committer | Steffen Zieger <me@saz.sh> | 2013-05-10 05:26:58 -0700 |
commit | 962798488db91310b11b257c0c8b797c0236380d (patch) | |
tree | 712a67b57d5b380cb8fe1a0a6062e063ac575a20 /manifests/config.pp | |
parent | 08c49965861137ae79620c7ca82af572f0ef024f (diff) | |
parent | 5c4812a4f44417d398ccc39cb28593b3df3ab9f4 (diff) |
Merge pull request #30 from mbornoz/improvements
Improvements
Diffstat (limited to 'manifests/config.pp')
-rw-r--r-- | manifests/config.pp | 21 |
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'], } |