From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 5 May 2009 09:39:03 +0000 (+0200)
Subject: Merge commit 'origin/template' into log
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=d5bf6579e5a2b8b429907c8ea0d35a52e1bb9883;p=matthijs%2Fservers%2Fdrsnuggles.git

Merge commit 'origin/template' into log

* commit 'origin/template':
  nss: Add some comments.
  rsyslog: Move all rsyslog log files into a subdir.
  rsyslog: Update logrotate config to new rsyslog config.
  rsyslog: Add default logrotate config.
  rsyslog: Disable logging of kernel messages.
  rsyslog: Enable loggin of mark lines.
  rsyslog: Clean up rsyslog configuration.
  rsyslog: Add default configuration.

* commits left out:
  rsyslog: Send all logs to the log vserver.
---

d5bf6579e5a2b8b429907c8ea0d35a52e1bb9883
diff --cc etc/rsyslog.conf
index 262d102,088b8bb..af42506
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@@ -74,3 -74,10 +74,9 @@@ local0,local1,local2,
  # Emergencies are sent to everybody logged in.
  #
  *.emerg				*
+ 
+ ########################
+ #### Remote logging ####
+ ########################
+ 
 -# Send all log entries to the log vserver
 -*.*				:omrelp:log:514;RSYSLOG_SyslogProtocol23Format
++# No use to send ourselvers logs