diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2014-02-05 16:39:23 +0100 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2014-02-05 16:39:23 +0100 |
| commit | 64ffadf9a76b4affe4ba69ab499fcdad1ccd76d5 (patch) | |
| tree | 062e58b222f77f21785f1698022ebb6d32c3cbe3 | |
| parent | ac32dffef3d0d9bc7cba8e1d325181773fc1605d (diff) | |
Add back rsyslog::rsyslog_default_file
| -rw-r--r-- | manifests/config.pp | 2 | ||||
| -rw-r--r-- | manifests/params.pp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index d7fbbe6..dbb37cc 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -34,7 +34,7 @@ class rsyslog::config { ensure => file, owner => 'root', group => $rsyslog::run_group, - source => 'puppet:///modules/rsyslog/rsyslog_default', + source => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}", require => Class['rsyslog::install'], notify => Class['rsyslog::service'], } diff --git a/manifests/params.pp b/manifests/params.pp index 194d7ca..34544c5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,6 +24,7 @@ class rsyslog::params { $purge_rsyslog_d = false $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/default/rsyslog' + $default_config_file = 'rsyslog_default' $run_user = 'root' $run_group = 'root' $log_user = 'root' @@ -57,6 +58,7 @@ class rsyslog::params { $rsyslog_d = '/etc/rsyslog.d/' $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/sysconfig/rsyslog' + $default_config_file = 'rsyslog_default' $run_user = 'root' $run_group = 'root' $log_user = 'root' @@ -85,6 +87,7 @@ class rsyslog::params { $rsyslog_d = '/etc/syslog.d/' $rsyslog_conf = '/etc/syslog.conf' $rsyslog_default = '/etc/defaults/syslogd' + $default_config_file = 'rsyslog_default' $run_user = 'root' $run_group = 'wheel' $log_user = 'root' |