diff options
author | Jakob Ackermann <das7pad@outlook.com> | 2019-04-17 03:08:25 +0200 |
---|---|---|
committer | techknowlogick <matti@mdranta.net> | 2019-04-16 21:08:25 -0400 |
commit | 62b35964e3533486735a722c6f0c18164c76719d (patch) | |
tree | 27a143a7ee82d8ea07a6cdf5a8111471c121c7cf | |
parent | 6821a32d8162c805bf15c0ce3502b8f12f39d9cb (diff) | |
download | gitea-62b35964e3533486735a722c6f0c18164c76719d.tar.gz gitea-62b35964e3533486735a722c6f0c18164c76719d.zip |
[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 <das7pad@outlook.com>
-rwxr-xr-x | docker/etc/s6/openssh/run | 2 | ||||
-rwxr-xr-x | docker/etc/s6/syslogd/finish | 2 | ||||
-rwxr-xr-x | docker/etc/s6/syslogd/run | 6 | ||||
-rwxr-xr-x | docker/etc/s6/syslogd/setup | 1 |
4 files changed, 1 insertions, 10 deletions
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 |