Merge pull request #5 from djjudas21/logging

Logging
djjudas21 · Feb 23, 2024 · 5ea0333 · 5ea0333
2 parents 0ec3424 + 12a4731
commit 5ea0333
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 28 deletions.
diff --git 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
diff --git a/etc/rsyslog.d/imux.conf b/etc/rsyslog.d/imux.conf
diff --git a/etc/rsyslog.d/maillog.conf b/etc/rsyslog.d/maillog.conf
diff --git a/etc/rsyslog.d/stdout.conf b/etc/rsyslog.d/stdout.conf
diff --git a/etc/supervisor.d/postfix.ini b/etc/supervisor.d/postfix.ini
diff --git a/etc/supervisor.d/rsyslog.ini b/etc/supervisor.d/rsyslog.ini
diff --git 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