rsyslog: Unify config for all nodes and for logserver as much as possible.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>

rsyslog/rsyslog.conf

@@ -1,5 +1,5 @@
 #
-#  /etc/rsyslog.conf	Configuration file for rsyslog v3. (Salt managed)
+#  /etc/rsyslog.conf	Configuration file for rsyslog. (Salt managed)
 #
 #			For more information see
 #			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
@@ -10,7 +10,7 @@
 #################
 
 $ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+$ModLoad imklog   # provides kernel logging support
 #$ModLoad immark  # provides --MARK-- message capability
 
 # provides UDP syslog reception
@@ -27,7 +27,7 @@ $ModLoad imklog   # provides kernel logging support (previously done by rklogd)
 ###########################
 
 #
-# Use default timestamp format.
+# Use traditional timestamp format.
 # To enable high precision timestamps, comment out the following line.
 #
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
@@ -38,6 +38,13 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 $FileOwner root
 $FileGroup adm
 $FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+
+#
+# Where to place spool and state files
+#
+$WorkDirectory /var/spool/rsyslog
 
 #
 # Include all config files in /etc/rsyslog-early.d/

rsyslog/rsyslog.conf.logserver

@@ -1,4 +1,5 @@
-#  /etc/rsyslog.conf	Configuration file for rsyslog.
+#
+#  /etc/rsyslog.conf	Configuration file for rsyslog. (Salt managed)
 #
 #			For more information see
 #			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
@@ -45,6 +46,11 @@ $Umask 0022
 #
 $WorkDirectory /var/spool/rsyslog
 
+#
+# Include all config files in /etc/rsyslog-early.d/
+#
+$IncludeConfig /etc/rsyslog-early.d/*.conf
+
 #
 # Include all config files in /etc/rsyslog.d/
 #
@@ -109,7 +115,7 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 
 # The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
 # you must invoke `xconsole' with the `-file' option:
-# 
+#
 #    $ xconsole -file /dev/xconsole [...]
 #
 # NOTE: adjust the list below, or you'll go crazy if you have a reasonably