summaryrefslogtreecommitdiff
path: root/templates/rsyslog.conf.erb
diff options
context:
space:
mode:
authorSaz <me@saz.sh>2011-12-03 15:26:28 +0100
committerSaz <me@saz.sh>2011-12-03 15:26:28 +0100
commitd352719c8c153b4e82fa3f262a5fa9b42788f346 (patch)
tree44dd4634292d5780b5bbd446adb0432fb8a016ca /templates/rsyslog.conf.erb
parentee1f0313ee4cf56785e35232adef4fa6dfc8fb89 (diff)
make high precision timestamps configurable, use variable lookup where possible, prepare for option to drop privileges to different user
Diffstat (limited to 'templates/rsyslog.conf.erb')
-rw-r--r--templates/rsyslog.conf.erb21
1 files changed, 12 insertions, 9 deletions
diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
index 51c52a4..d522ae0 100644
--- a/templates/rsyslog.conf.erb
+++ b/templates/rsyslog.conf.erb
@@ -8,29 +8,32 @@ $ModLoad imuxsock # provides support for local system logging
$ModLoad imklog # provides kernel logging support (previously done by rklogd)
#$ModLoad immark # provides --MARK-- message capability
-
-###########################
-#### GLOBAL DIRECTIVES ####
-###########################
-
+<% if scope.lookupvar('rsyslog::params::high_precision_timestamps') == false -%>
#
# Use traditional timestamp format.
# To enable high precision timestamps, comment out the following line.
#
$ActionFileDefaultTemplate RSYSLOG_ForwardFormat
+<% end -%>
+
+###########################
+#### GLOBAL DIRECTIVES ####
+###########################
#
# Set the default permissions for all log files.
#
-$FileOwner root
-$FileGroup adm
+$FileOwner <%= scope.lookupvar('rsyslog::params::log_user') %>
+$FileGroup <%= scope.lookupvar('rsyslog::params::log_group') %>
$FileCreateMode 0640
$DirCreateMode 0755
+$PrivDropToUser <%= scope.lookupvar('rsyslog::params::run_user') %>
+$PrivDropToGroup <%= scope.lookupvar('rsyslog::params::run_group') %>
#
-# Include all config files in /etc/rsyslog.d/
+# Include all config files in <%= scope.lookupvar('rsyslog::params::rsyslog_d') %>
#
-$IncludeConfig /etc/rsyslog.d/*.conf
+$IncludeConfig <%= scope.lookupvar('rsyslog::params::rsyslog_d') -%>*.conf
#
# Emergencies are sent to everybody logged in.