Merge commit 'origin/template' into ldap

* commit 'origin/template':
  rsyslog: Use another format for forwarding messages.
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.

diff --git a/etc/default/ssh b/etc/default/ssh
new file mode 100644 (file)
index 0000000..afbc23b
--- /dev/null
+++ b/etc/default/ssh
@@ -0,0 +1,12 @@
+# Default settings for openssh-server. This file is sourced by /bin/sh from
+# /etc/init.d/ssh.
+
+# Options to pass to sshd
+SSHD_OPTS=
+
+# OOM-killer adjustment for sshd (see
+# linux/Documentation/filesystems/proc.txt; lower values reduce likelihood
+# of being killed, while -17 means the OOM-killer will ignore sshd; set to
+# the empty string to skip adjustment)
+# Disabled since oom_adj is not available inside vservers
+SSHD_OOM_ADJUST=

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index c6e706be16f977a902719e8b94f3c67036c3685c..ab6876b8b1228eadb758bc402c72a37d9880cb34 100644 (file)
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -100,4 +100,4 @@ $ActionQueueFileName remote
 $ActionResumeRetryCount -1
 # save in-memory data if rsyslog shuts down
 $ActionQueueSaveOnShutdown on
-*.*                            @@log;RSYSLOG_SyslogProtocol23Format
+*.*                            @@log;RSYSLOG_ForwardFormat