Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity

fixed syslog warning when using --tty as described in #468

Browse Source
This commit is contained in:
David Hiendl
2018-02-22 08:53:27 +01:00
parent 14896d9181
commit be8fc49e52
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image/services/syslog-ng/syslog-ng.conf
View File

@@ -75,7 +75,7 @@ destination d_xconsole { pipe("/dev/xconsole"); };
destination d_ppp { file("/var/log/ppp.log"); }; destination d_ppp { file("/var/log/ppp.log"); };
# stdout for docker # stdout for docker
destination d_stdout { pipe("/dev/stdout"); }; destination d_stdout { ##SYSLOG_OUTPUT_MODE_DEV_STDOUT##("/dev/stdout"); };
######################## ########################
# Filters # Filters

7
image/services/syslog-ng/syslog-ng.init
View File

@@ -7,6 +7,13 @@ set -em
if [ ! -S /dev/log ]; then rm -f /dev/log; fi if [ ! -S /dev/log ]; then rm -f /dev/log; fi
if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
# determine output mode on /dev/stdout because of the issue documented at https://github.com/phusion/baseimage-docker/issues/468
if [ -p /dev/stdout ]; then
sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/pipe/' /etc/syslog-ng/syslog-ng.conf
else
sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/file/' /etc/syslog-ng/syslog-ng.conf
fi
PIDFILE="/var/run/syslog-ng.pid" PIDFILE="/var/run/syslog-ng.pid"
SYSLOGNG_OPTS="" SYSLOGNG_OPTS=""