From 9e29f678d8a7c3f0433b7c71e143aa7532bf95d2 Mon Sep 17 00:00:00 2001
From: Ralf Heiringhoff <ralf.heiringhoff@1und1.de>
Date: Tue, 28 Aug 2012 12:04:37 +0200
Subject: added Red Hat, CentOS, Fedora support; File/Dir permissions now in
 params.pp

---
 templates/client.conf.erb  | 31 +++++++++++++++++++++++++++++++
 templates/rsyslog.conf.erb |  4 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index 67f8274..ffe5a8d 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -21,11 +21,17 @@ $ActionResumeRetryCount -1      # infinety retries if host is down
 # We log locally, restore to default format
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 
+<% if scope.lookupvar('rsyslog::client::log_style') == 'debian' -%>
 # Log auth messages locally
 auth,authpriv.*                 /var/log/auth.log
+<% elsif scope.lookupvar('rsyslog::client::log_style') == 'redhat' -%>
+# Log auth messages locally
+auth,authpriv.*                 /var/log/secure
+<% end -%>
 <% end -%>
 
 <% if scope.lookupvar('rsyslog::client::log_local') -%>
+<% if scope.lookupvar('rsyslog::client::log_os_style') == 'debian' -%>
 # First some standard log files.  Log by facility.
 #
 *.*;auth,authpriv.none         -/var/log/syslog
@@ -83,4 +89,29 @@ daemon.*;mail.*;\
         news.err;\
         *.=debug;*.=info;\
         *.=notice;*.=warn       |/dev/xconsole
+<% elsif scope.lookupvar('rsyslog::client::log_os_style') == 'redhat' -%>
+# Log all kernel messages to the console.
+# Logging much else clutters up the screen.
+#kern.*                                                 /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none                /var/log/messages
+
+# Log all the mail messages in one place.
+mail.*                         -/var/log/maillog
+
+
+# Log cron stuff
+cron.*                         /var/log/cron
+
+# Everybody gets emergency messages
+*.emerg                        *
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit                 -/var/log/spooler
+
+# Save boot messages also to boot.log
+local7.*                       -/var/log/boot.log
+<% end -%>
 <% end -%>
diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
index 12f85c3..dd7e259 100644
--- a/templates/rsyslog.conf.erb
+++ b/templates/rsyslog.conf.erb
@@ -17,8 +17,8 @@ $ModLoad imklog   # provides kernel logging support (previously done by rklogd)
 #
 $FileOwner <%= scope.lookupvar('rsyslog::params::log_user') %>
 $FileGroup <%= scope.lookupvar('rsyslog::params::log_group') %>
-$FileCreateMode 0640
-$DirCreateMode 0755
+$FileCreateMode <%= scope.lookupvar('rsyslog::params::perm_file') %>
+$DirCreateMode <%= scope.lookupvar('rsyslog::params::perm_dir') %>
 $PrivDropToUser <%= scope.lookupvar('rsyslog::params::run_user') %>
 $PrivDropToGroup <%= scope.lookupvar('rsyslog::params::run_group') %>
 
-- 
cgit v1.2.3