summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp4
-rw-r--r--templates/rsyslog.conf.erb4
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index fbe22f6..e4692ba 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,6 +11,8 @@
# class { 'rsyslog': }
#
class rsyslog (
+ $run_user = 0,
+ $run_group = 0,
$rsyslog_package_name = $rsyslog::params::rsyslog_package_name,
$relp_package_name = $rsyslog::params::relp_package_name,
$mysql_package_name = $rsyslog::params::mysql_package_name,
@@ -22,8 +24,6 @@ class rsyslog (
$rsyslog_conf = $rsyslog::params::rsyslog_conf,
$rsyslog_default = $rsyslog::params::rsyslog_default,
$rsyslog_default_file = $rsyslog::params::default_config_file,
- $run_user = $rsyslog::params::run_user,
- $run_group = $rsyslog::params::run_group,
$log_user = $rsyslog::params::log_user,
$log_group = $rsyslog::params::log_group,
$log_style = $rsyslog::params::log_style,
diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
index f076fc4..609aa78 100644
--- a/templates/rsyslog.conf.erb
+++ b/templates/rsyslog.conf.erb
@@ -20,8 +20,8 @@ $FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %>
$DirOwner <%= scope.lookupvar('rsyslog::log_user') %>
$DirGroup <%= scope.lookupvar('rsyslog::log_group') %>
$DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %>
-$PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %>
-$PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %>
+$PrivDropToUserID <%= scope.lookupvar('rsyslog::run_user') %>
+$PrivDropToGroupID <%= scope.lookupvar('rsyslog::run_group') %>
#
# Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %>