From 62b35964e3533486735a722c6f0c18164c76719d Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 17 Apr 2019 03:08:25 +0200 Subject: [PATCH] [docker] let the ssh daemon speak for itself and drop the syslog daemon (#6529) The sshd flag `-e` instructs sshd to output any logs to stderr instead of the syslog. Redirect this output to stdout then. Signed-off-by: Jakob Ackermann --- docker/etc/s6/openssh/run | 2 +- docker/etc/s6/syslogd/finish | 2 -- docker/etc/s6/syslogd/run | 6 ------ docker/etc/s6/syslogd/setup | 1 - 4 files changed, 1 insertion(+), 10 deletions(-) delete mode 100755 docker/etc/s6/syslogd/finish delete mode 100755 docker/etc/s6/syslogd/run delete mode 100755 docker/etc/s6/syslogd/setup diff --git a/docker/etc/s6/openssh/run b/docker/etc/s6/openssh/run index 502e7f6dde..6395024825 100755 --- a/docker/etc/s6/openssh/run +++ b/docker/etc/s6/openssh/run @@ -2,5 +2,5 @@ [[ -f ./setup ]] && source ./setup pushd /root > /dev/null - exec su-exec root /usr/sbin/sshd -D + exec su-exec root /usr/sbin/sshd -D -e 2>&1 popd diff --git a/docker/etc/s6/syslogd/finish b/docker/etc/s6/syslogd/finish deleted file mode 100755 index 06bd986563..0000000000 --- a/docker/etc/s6/syslogd/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exit 0 diff --git a/docker/etc/s6/syslogd/run b/docker/etc/s6/syslogd/run deleted file mode 100755 index 2c8d2cf1f2..0000000000 --- a/docker/etc/s6/syslogd/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -[[ -f ./setup ]] && source ./setup - -pushd /root > /dev/null - exec su-exec root /sbin/syslogd -nS -O- -popd diff --git a/docker/etc/s6/syslogd/setup b/docker/etc/s6/syslogd/setup deleted file mode 100755 index a9bf588e2f..0000000000 --- a/docker/etc/s6/syslogd/setup +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash