add configuration for local logging, use variable lookup where possible

1 files changed, 69 insertions, 3 deletions

diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index 7e123a3..c29784b 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -1,12 +1,78 @@
 # file is managed by puppet
 
 # An "In-Memory Queue" is created for remote logging.
-$WorkDirectory /var/spool/rsyslog       # where to place spool files
-$ActionQueueFileName queue              # unique name prefix for spool files
+$WorkDirectory <%= scope.lookupvar('rsyslog::params::spool_dir') -%>    # where to place spool files
+$ActionQueueFileName queue      # unique name prefix for spool files
 $ActionQueueMaxDiskSpace 1g     # 1gb space limit (use as much as possible)
 $ActionQueueSaveOnShutdown on   # save messages to disk on shutdown
 $ActionQueueType LinkedList     # run asynchronously
 $ActionResumeRetryCount -1      # infinety retries if host is down
 
+# Log to remote syslog server using relp
 $ModLoad omrelp
-*.*     :omrelp:<%= scope.lookupvar('rsyslog::params::rsyslog_server') %>:2514;RSYSLOG_ForwardFormat
+*.*     :omrelp:<%= scope.lookupvar('rsyslog::client::server') -%>:2514;RSYSLOG_ForwardFormat
+
+<% if scope.lookupvar('rsyslog::client::log_auth_local') or scope.lookupvar('rsyslog::client::log_local') -%>
+# Log auth messages locally
+auth,authpriv.*                 /var/log/auth.log
+<% end -%>
+
+<% if scope.lookupvar('rsyslog::client::log_local') -%>
+# First some standard log files.  Log by facility.
+#
+*.*;auth,authpriv.none         -/var/log/syslog
+cron.*                          /var/log/cron.log
+daemon.*                       -/var/log/daemon.log
+kern.*                         -/var/log/kern.log
+#lpr.*                          -/var/log/lpr.log
+mail.*                         -/var/log/mail.log
+user.*                         -/var/log/user.log
+
+#
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+mail.info                      -/var/log/mail.info
+mail.warn                      -/var/log/mail.warn
+mail.err                        /var/log/mail.err
+
+#
+# Logging for INN news system.
+#
+news.crit                       /var/log/news/news.crit
+news.err                        /var/log/news/news.err
+news.notice                     -/var/log/news/news.notice
+
+#
+# Some "catch-all" log files.
+#
+*.=debug;\
+       auth,authpriv.none;\
+       news.none;mail.none     -/var/log/debug
+*.=info;*.=notice;*.=warn;\
+       auth,authpriv.none;\
+       cron,daemon.none;\
+       mail,news.none          -/var/log/messages
+
+#
+# I like to have messages displayed on the console, but only on a virtual
+# console I usually leave idle.
+#
+#daemon,mail.*;\
+#       news.=crit;news.=err;news.=notice;\
+#       *.=debug;*.=info;\
+#       *.=notice;*.=warn       /dev/tty8
+
+# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
+# you must invoke `xconsole' with the `-file' option:
+# 
+#    $ xconsole -file /dev/xconsole [...]
+#
+# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
+#      busy site..
+#
+daemon.*;mail.*;\
+        news.err;\
+        *.=debug;*.=info;\
+        *.=notice;*.=warn       |/dev/xconsole
+<% end -%>