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/libnss-ldap.conf b/etc/libnss-ldap.conf
index 7154a4d28da9648c6db8b6be24ac9e849615d8c0..32b8645997edd7c3170292ec6cb6398614ae1278 100644 (file)
--- a/etc/libnss-ldap.conf
+++ b/etc/libnss-ldap.conf
@@ -12,7 +12,10 @@ uri ldap://ldap.drsnuggles.stderr.nl
 # The LDAP version to use
 ldap_version 3
 
-# Use uniqueMember
+# Use the uniqueMember property, referring to dn's instead of the memberUid
+# property referring to usernames. This allows us to have group members with or
+# without an account, and give a group member an account without having to
+# change all his memberships.
 nss_schema rfc2307bis
 
 # Use our custom posixGroup replacement

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 262d102b15b8107721e93a50d4a909dca31b95a1..af425069bf06d8d786aa77f18bbc0d5d9996cd60 100644 (file)
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -36,9 +36,9 @@ $DirCreateMode 0755
 $IncludeConfig /etc/rsyslog.d/*.conf
 
 
-###############
-#### RULES ####
-###############
+#######################
+#### Local logging ####
+#######################
 
 #
 # Log each facility into its own log
@@ -74,3 +74,9 @@ local0,local1,local2,\
 # Emergencies are sent to everybody logged in.
 #
 *.emerg                                *
+
+########################
+#### Remote logging ####
+########################
+
+# No use to send ourselvers logs