diff --git a/Dockerfile b/Dockerfile index 294339b..f07b2ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/thallian/confd-env:latest -RUN apk add --no-cache postfix postfix-ldap rsyslog spamassassin-client libstdc++ g++ make tar libmilter-dev +RUN apk add --no-cache postfix postfix-ldap syslog-ng spamassassin-client libstdc++ g++ make tar libmilter-dev RUN mkdir /tmp/spamass-milter RUN wget -qO- http://download.savannah.gnu.org/releases/spamass-milt/spamass-milter-0.4.0.tar.gz | tar -xz -C /tmp/spamass-milter --strip 1 diff --git a/rootfs/etc/rsyslog.conf b/rootfs/etc/rsyslog.conf deleted file mode 100644 index f3f48e1..0000000 --- a/rootfs/etc/rsyslog.conf +++ /dev/null @@ -1,48 +0,0 @@ -# rsyslogd.conf -# -# if you experience problems, check: -# http://www.rsyslog.com/troubleshoot - -#### MODULES #### - -module(load="imuxsock") # local system logging support (e.g. via logger command) -#module(load="imklog") # kernel logging support (previously done by rklogd) -module(load="immark") # --MARK-- message support -module(load="imudp") # UDP listener support - - -input(type="imudp" port="514") - -# Log all kernel messages to the console. -# Logging much else clutters up the screen. -#kern.* action(type="omfile" file="/dev/console") - -# Log anything (except mail) of level info or higher. -# Don't log private authentication messages! -*.info;mail.none;authpriv.none;cron.none action(type="omfile" file="/var/log/messages") - -# The authpriv file has restricted access. -authpriv.* action(type="omfile" file="/var/log/secure") - -# Log all the mail messages in one place. -mail.* action(type="omfile" file="/dev/console") - -# Log cron stuff -cron.* action(type="omfile" file="/var/log/cron") - -# Everybody gets emergency messages -*.emerg action(type="omusrmsg" users="*") - -# Save news errors of level crit and higher in a special file. -uucp,news.crit action(type="omfile" file="/var/log/spooler") - -# Save boot messages also to boot.log -local7.* action(type="omfile" file="/var/log/boot.log") - -# log every host in its own directory -if $fromhost-ip then /var/log/$fromhost-ip/messages - -# Include all .conf files in /etc/rsyslog.d -$IncludeConfig /etc/rsyslog.d/*.conf -$template GRAYLOGRFC5424,"<%PRI%>%PROTOCOL-VERSION% %TIMESTAMP:::date-rfc3339% %HOSTNAME% %APP-NAME% %PROCID% %MSGID% %STRUCTURED-DATA% %msg%\n" -*.info;mail.none;authpriv.none;cron.none;*.* @@graylog:514;GRAYLOGRFC5424 # forward everything to remote server diff --git a/rootfs/etc/services.d/rsyslog/run b/rootfs/etc/services.d/rsyslog/run deleted file mode 100644 index bc9eb91..0000000 --- a/rootfs/etc/services.d/rsyslog/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv sh - -exec rsyslogd -n diff --git a/rootfs/etc/services.d/syslog-ng/run b/rootfs/etc/services.d/syslog-ng/run new file mode 100644 index 0000000..dd9f88a --- /dev/null +++ b/rootfs/etc/services.d/syslog-ng/run @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv sh + +cd /var +exec syslog-ng --foreground diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 0000000..ff2f03b --- /dev/null +++ b/rootfs/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,8 @@ +destination catchall { + file(/dev/console); +}; + +log { + source(syslog); + destination(catchall); +};