From: root <root@drsnuggles.stderr.nl>
Date: Tue, 5 May 2009 16:20:22 +0000 (+0200)
Subject: Merge commit 'origin/template' into mail
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=d6c199de94861a9149558b44a34dd902d7f1e55c;hp=59415dbc6f1035e08473fc7f4887e38d3ef34f07;p=matthijs%2Fservers%2Fdrsnuggles.git

Merge commit 'origin/template' into mail

* 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
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 c6e706b..ab6876b 100644
--- 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