Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 04:18:46 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into syslog-shutdown

Browse Source
This commit is contained in:
Travis Rowland
2017-10-30 11:59:01 -07:00
committed by GitHub
parent 91363dcf37 421ca4ea05
commit b05616332a
7 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image/services/syslog-ng/logrotate_syslogng
View File

@@ -8,7 +8,6 @@
compress
postrotate
sv reload syslog-ng > /dev/null
sv restart syslog-forwarder > /dev/null
endscript
}
@@ -34,6 +33,5 @@
sharedscripts
postrotate
sv reload syslog-ng > /dev/null
sv restart syslog-forwarder > /dev/null
endscript
}

2
image/services/syslog-ng/syslog-forwarder.runit
View File

@@ -1,2 +0,0 @@
#!/bin/sh
exec tail -F -n 0 /var/log/syslog

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

@@ -74,6 +74,9 @@ destination d_xconsole { pipe("/dev/xconsole"); };
# Debian only
destination d_ppp { file("/var/log/ppp.log"); };
# stdout for docker
destination d_stdout { pipe("/dev/stdout"); };
########################
# Filters
########################
@@ -119,7 +122,7 @@ log { source(s_src); filter(f_cron); destination(d_cron); };
log { source(s_src); filter(f_daemon); destination(d_daemon); };
log { source(s_src); filter(f_kern); destination(d_kern); };
log { source(s_src); filter(f_lpr); destination(d_lpr); };
log { source(s_src); filter(f_syslog3); destination(d_syslog); };
log { source(s_src); filter(f_syslog3); destination(d_syslog); destination(d_stdout); };
log { source(s_src); filter(f_user); destination(d_user); };
log { source(s_src); filter(f_uucp); destination(d_uucp); };

4
image/services/syslog-ng/syslog-ng.sh
View File

@@ -15,10 +15,6 @@ touch /var/log/syslog
chmod u=rw,g=r,o= /var/log/syslog
cp $SYSLOG_NG_BUILD_PATH/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
## Install syslog to "docker logs" forwarder.
mkdir /etc/service/syslog-forwarder
cp $SYSLOG_NG_BUILD_PATH/syslog-forwarder.runit /etc/service/syslog-forwarder/run
## Install logrotate.
$minimal_apt_get_install logrotate
cp $SYSLOG_NG_BUILD_PATH/logrotate.conf /etc/logrotate.conf