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

Merge commit 'origin/template' into mail

* commit 'origin/template':
  rsyslog: Make the main queue disk-assisted as well.
  rsyslog: Enable queuing of log messages.
  nss: Add some comments.
  rsyslog: Send all logs to the log vserver.
  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.
  pam: Add pam_permit to the auth section of chfn.
  nss: Update to use our custom LDAP schema.
  apt: Set the Default-Release to "stable".

Conflicts:

	etc/rsyslog.conf
---

b17c59cdaba252243080d79ec3e800a840e3e2f2