X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Frsyslog.conf;h=fee816c5bcb619f3b50c7b37a8d8e9aa3d3fe4d6;hb=1b36496e62f7d883bd9a25f6bfe3e105ae340391;hp=5dfd304d8d1224d529f62bd7714cd958303f7148;hpb=865bbbf744cea26bdc94ce5932fa30ff74d46dee;p=matthijs%2Fservers%2Ftika.git

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 5dfd304..fee816c 100644
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -12,6 +12,9 @@ $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 ####
 ###########################
@@ -52,7 +55,11 @@ $MainMsgQueueSaveOnShutdown on
 #### Local logging ####
 #######################
 
-#
+# Discard all log entries not locally generated (note that the ~ here is the
+# "discard" action, preventing the rules below from bein ran on these messages.
+if $fromhost-ip != '127.0.0.1' then ~
+
+
 # Log each facility into its own log
 auth,authpriv.*			/var/log/rsyslog/auth.log
 cron.*				-/var/log/rsyslog/user.log
@@ -86,21 +93,3 @@ local0,local1,local2,\
 # Emergencies are sent to everybody logged in.
 #
 *.emerg				*
-
-########################
-#### Remote logging ####
-########################
-
-# Send all log entries to the log vserver, but queue them in memory as well as
-# on disk if needed.
-# Use a linked list for queueing
-$ActionQueueType LinkedList
-# Name to use for the queue file
-$ActionQueueFileName remote
-# infinite retries on insert failure
-$ActionResumeRetryCount -1
-# save in-memory data if rsyslog shuts down
-$ActionQueueSaveOnShutdown on
-# Disabled for now
-#*.*				@@log.local;RSYSLOG_SyslogProtocol23Format
-