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 --git a/etc/hostname b/etc/hostname
new file mode 100644 (file)
index 0000000..2ff2003
--- /dev/null
+++ b/etc/hostname
@@ -0,0 +1 @@
+log.drsnuggles.stderr.nl

diff --git a/etc/mailname b/etc/mailname
new file mode 100644 (file)
index 0000000..2ff2003
--- /dev/null
+++ b/etc/mailname
@@ -0,0 +1 @@
+log.drsnuggles.stderr.nl

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 088b8bbb3411d6f750fee7e64355d64db8cbe263..af425069bf06d8d786aa77f18bbc0d5d9996cd60 100644 (file)
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -79,5 +79,4 @@ local0,local1,local2,\
 #### Remote logging ####
 ########################
 
-# Send all log entries to the log vserver
-*.*                            :omrelp:log:514;RSYSLOG_SyslogProtocol23Format
+# No use to send ourselvers logs