diff --git a/Dockerfile b/Dockerfile index 0cb3296..33bfe11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.19 LABEL maintainer "Jonathan Gazeley" -RUN apk add --no-cache postfix rsyslog supervisor \ +RUN apk add --no-cache postfix \ && /usr/bin/newaliases COPY . / diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf deleted file mode 100644 index fd1977e..0000000 --- a/etc/rsyslog.conf +++ /dev/null @@ -1,6 +0,0 @@ -# http://www.rsyslog.com/doc/ - -$ModLoad immark.so # provide --MARK-- message capability - -$IncludeConfig /etc/rsyslog.d/*.conf - diff --git a/etc/rsyslog.d/imux.conf b/etc/rsyslog.d/imux.conf deleted file mode 100644 index 41e3e2d..0000000 --- a/etc/rsyslog.d/imux.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Input modules -module(load="imuxsock") -input(type="imuxsock" Socket="/var/run/rsyslog/dev/log" CreatePath="on") \ No newline at end of file diff --git a/etc/rsyslog.d/maillog.conf b/etc/rsyslog.d/maillog.conf deleted file mode 100644 index ee7da1e..0000000 --- a/etc/rsyslog.d/maillog.conf +++ /dev/null @@ -1 +0,0 @@ -mail.* -/var/log/maillog \ No newline at end of file diff --git a/etc/rsyslog.d/stdout.conf b/etc/rsyslog.d/stdout.conf deleted file mode 100644 index 84fb0ff..0000000 --- a/etc/rsyslog.d/stdout.conf +++ /dev/null @@ -1,3 +0,0 @@ -$ModLoad omstdout.so # provide messages to stdout - -*.* :omstdout: # send everything to stdout \ No newline at end of file diff --git a/etc/supervisor.d/postfix.ini b/etc/supervisor.d/postfix.ini deleted file mode 100644 index 76fd367..0000000 --- a/etc/supervisor.d/postfix.ini +++ /dev/null @@ -1,6 +0,0 @@ -[program:postfix] -process_name = master -directory = /etc/postfix -command = /usr/sbin/postfix -c /etc/postfix start -startsecs = 0 -autorestart = false \ No newline at end of file diff --git a/etc/supervisor.d/rsyslog.ini b/etc/supervisor.d/rsyslog.ini deleted file mode 100644 index 15f59cb..0000000 --- a/etc/supervisor.d/rsyslog.ini +++ /dev/null @@ -1,7 +0,0 @@ -[program:rsyslog] -command=/usr/sbin/rsyslogd -n -numprocs=1 -autostart=true -autorestart=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 \ No newline at end of file diff --git a/smtp-relay.sh b/smtp-relay.sh index 5c47986..e4d9bdb 100755 --- a/smtp-relay.sh +++ b/smtp-relay.sh @@ -31,4 +31,8 @@ postconf 'smtputf8_enable = no' || exit 1 # This makes sure the message id is set. If this is set to no dkim=fail will happen. postconf 'always_add_missing_headers = yes' || exit 1 -/usr/bin/supervisord -n +# Log to stdout +postconf 'maillog_file = /dev/stdout' || exit 1 + +# Start postfix +postfix start-fg