diff options
| author | Adam Stephens <adam.c.stephens@noaa.gov> | 2014-02-05 15:24:43 -0500 |
|---|---|---|
| committer | Adam Stephens <adam.c.stephens@noaa.gov> | 2014-02-05 15:24:43 -0500 |
| commit | 97891aa2a071006c396da1f707db8f2cb033125c (patch) | |
| tree | c9256f20270808068c8c07d7afd019a5aa999358 /manifests/params.pp | |
| parent | b75cd78311482b842c5bd3f19e57fdbd3bad25d4 (diff) | |
| parent | 974461946abf2ff705d1644d900268618eecdbb0 (diff) | |
Merge branch 'master' of https://github.com/saz/puppet-rsyslog into el5
Conflicts:
templates/rsyslog.conf.erb
Diffstat (limited to 'manifests/params.pp')
| -rw-r--r-- | manifests/params.pp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index e7f3859..5bf75cf 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -25,6 +25,8 @@ class rsyslog::params { $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/default/rsyslog' $default_config_file = 'rsyslog_default' + $run_user = 'root' + $run_group = 'root' $log_user = 'root' $log_group = 'adm' $log_style = 'debian' @@ -60,6 +62,8 @@ class rsyslog::params { $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/sysconfig/rsyslog' $default_config_file = 'rsyslog_default' + $run_user = 'root' + $run_group = 'root' $log_user = 'root' $log_group = 'root' $log_style = 'redhat' @@ -87,6 +91,8 @@ class rsyslog::params { $rsyslog_conf = '/etc/syslog.conf' $rsyslog_default = '/etc/defaults/syslogd' $default_config_file = 'rsyslog_default' + $run_user = 'root' + $run_group = 'wheel' $log_user = 'root' $log_group = 'wheel' $log_style = 'debian' @@ -103,6 +109,7 @@ class rsyslog::params { '#$ModLoad immark # provides --MARK-- message capability', ] } + default: { case $::operatingsystem { gentoo: { @@ -117,6 +124,8 @@ class rsyslog::params { $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/conf.d/rsyslog' $default_config_file = 'rsyslog_default_gentoo' + $run_user = 'root' + $run_group = 'root' $log_user = 'root' $log_group = 'adm' $log_style = 'debian' @@ -139,5 +148,4 @@ class rsyslog::params { } } } - } |