X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Frsyslog.conf;fp=etc%2Frsyslog.conf;h=1fb94a79503bd0f7baffa30f74adba2170dbe213;hb=1f22be2e6677e29ca4c4a3b7d596cc86ce46fd0f;hp=af425069bf06d8d786aa77f18bbc0d5d9996cd60;hpb=d5bf6579e5a2b8b429907c8ea0d35a52e1bb9883;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index af42506..1fb94a7 100644
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -11,6 +11,8 @@
 $ModLoad imuxsock # provides support for local system logging
 $ModLoad immark   # provides --MARK-- message capability
 $MarkMessagePeriod  900 # mark messages appear every 15 Minutes
+$ModLoad imtcp
+$InputTCPServerRun 514 # Accept TCP connections on the default syslog port
 
 ###########################
 #### GLOBAL DIRECTIVES ####
@@ -35,12 +37,36 @@ $DirCreateMode 0755
 #
 $IncludeConfig /etc/rsyslog.d/*.conf
 
+########################
+#### Remote logging ####
+########################
+
+# Log lines received from other servers (as well as our own logs) centrally.
+$template FacilityLog,"/data/log/rsyslog/%hostname%/facilities/%syslogfacility-text%.log"
+$template SeverityLog,"/data/log/rsyslog/%hostname%/severities/%syslogseverity-text%.log"
+$template AppLog,"/data/log/rsyslog/%hostname%/apps/%app-name%.log"
+$template AllLog,"/data/log/rsyslog/all.log"
+
+# Use a verbose logging format
+$template LogFormat, "%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag% %syslogfacility-text%.%syslogseverity-text%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
+
+# Log by facility, severity and appname
+*.*				?FacilityLog;LogFormat
+*.*				?SeverityLog;LogFormat
+*.*				?AppLog;LogFormat
+# Log all entries in a single file, which is meant to be parsed by logcheck
+# (hence the traditional format).
+*.*				?AllLog;RSYSLOG_TraditionalFileFormat
 
 #######################
 #### Local logging ####
 #######################
 
-#
+# Discard all log entries not locally generated. Newer versions of rsyslogd
+# have the $fromhost-ip property which can be checked against 127.0.0.1, which
+# is probably slightly more reliable, but this will work for now.
+if $fromhost != 'log' then ~
+
 # Log each facility into its own log
 auth,authpriv.*			/var/log/rsyslog/auth.log
 cron.*				-/var/log/rsyslog/user.log
@@ -75,8 +101,3 @@ local0,local1,local2,\
 #
 *.emerg				*
 
-########################
-#### Remote logging ####
-########################
-
-# No use to send ourselvers logs