From 0b8473f2a9788f8df69bc94d6c5bfcc5c3b78c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Wed, 5 Feb 2014 16:26:51 +0100
Subject: Revert "fix run_user and run_group"

This reverts commit 4efaf7576dafb701a67052b41b7fa87935dd6db5.
---
 manifests/init.pp          | 4 ++--
 templates/rsyslog.conf.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index e4692ba..fbe22f6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,8 +11,6 @@
 #  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,
@@ -24,6 +22,8 @@ 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 609aa78..f076fc4 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') %>
-$PrivDropToUserID <%= scope.lookupvar('rsyslog::run_user') %>
-$PrivDropToGroupID <%= scope.lookupvar('rsyslog::run_group') %>
+$PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %>
+$PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %>
 
 #
 # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %>
-- 
cgit v1.2.3