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.

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