mirror of
/repos/baseimage-docker.git
synced 2026-02-27 17:41:59 +01:00
Fixed syslog-ng not being able to start because of a missing afsql module.
Closes pull request 7.
This commit is contained in:
13
image/config/syslog_ng_default
Normal file
13
image/config/syslog_ng_default
Normal file
@@ -0,0 +1,13 @@
|
||||
# If a variable is not set here, then the corresponding
|
||||
# parameter will not be changed.
|
||||
# If a variables is set, then every invocation of
|
||||
# syslog-ng's init script will set them using dmesg.
|
||||
|
||||
# log level of messages which should go to console
|
||||
# see syslog(3) for details
|
||||
#
|
||||
#CONSOLE_LOG_LEVEL=1
|
||||
|
||||
# Command line options to syslog-ng
|
||||
# We set --default-modules because of https://github.com/phusion/baseimage-docker/pull/7.
|
||||
SYSLOGNG_OPTS="--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat"
|
||||
@@ -1,3 +1,24 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
exec syslog-ng -F -p /var/run/syslog-ng.pid
|
||||
|
||||
SYSLOGNG_OPTS=""
|
||||
|
||||
[ -r /etc/default/syslog-ng ] && . /etc/default/syslog-ng
|
||||
|
||||
case "x$CONSOLE_LOG_LEVEL" in
|
||||
x[1-8])
|
||||
dmesg -n $CONSOLE_LOG_LEVEL
|
||||
;;
|
||||
x)
|
||||
;;
|
||||
*)
|
||||
echo "CONSOLE_LOG_LEVEL is of unaccepted value."
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ ! -e /dev/xconsole ]
|
||||
then
|
||||
mknod -m 640 /dev/xconsole p
|
||||
fi
|
||||
|
||||
exec syslog-ng -F -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS
|
||||
|
||||
@@ -15,6 +15,7 @@ $minimal_apt_get_install syslog-ng-core
|
||||
mkdir /etc/service/syslog-ng
|
||||
cp /build/runit/syslog-ng /etc/service/syslog-ng/run
|
||||
mkdir -p /var/lib/syslog-ng
|
||||
cp /build/config/syslog_ng_default /etc/default/syslog-ng
|
||||
|
||||
## Install the SSH server.
|
||||
$minimal_apt_get_install openssh-server
|
||||
|
||||
Reference in New Issue
Block a user