From bc95107b54b7df9a5f422b7a6cdcd366ddef410b Mon Sep 17 00:00:00 2001
From: Jarrod Smith <agentsmith@makermatrix.com>
Date: Wed, 9 Dec 2020 20:02:27 +0000
Subject: [PATCH] Get rid of syslogd warning about kernel logging.

---
 Dockerfile             | 3 +++
 README.md              | 2 ++
 target/postfix/main.cf | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 926c5a7b..6daa41f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -220,6 +220,9 @@ RUN sed -i -r "/^#?compress/c\compress\ncopytruncate" /etc/logrotate.conf && \
   # prevent syslog logrotate warnings \
   sed -i -e 's/\(printerror "could not determine current runlevel"\)/#\1/' /usr/sbin/invoke-rc.d && \
   sed -i -e 's/^\(POLICYHELPER=\).*/\1/' /usr/sbin/invoke-rc.d && \
+  # Prevent syslog warning about imklog permissions.
+  # We won't want to look at that inside a container anyway.
+  sed -i -e 's/^module\(load="imklog"\)/#module\(load="imklog"\)/' /etc/rsyslog.conf && \
   # prevent email when /sbin/init or init system is not existing \
   sed -i -e 's|invoke-rc.d rsyslog rotate > /dev/null|/usr/bin/supervisorctl signal hup rsyslog >/dev/null|g' /usr/lib/rsyslog/rsyslog-rotate
 
diff --git a/README.md b/README.md
index 75677aef..15c6a7f5 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,7 @@ chmod a+x ./setup.sh
 docker-compose up -d mail
 
 ./setup.sh email add <user@domain> [<password>]
+./setup.sh alias add postmaster@<domain> <user@domain>
 ./setup.sh config dkim
 ```
 
@@ -131,6 +132,7 @@ Edit the files `.env` and `docker-compose.yml`. In `.env` uncomment the variable
 docker-compose up -d mail
 
 ./setup.sh -Z email add <user@domain> [<password>]
+./setup.sh -Z alias add postmaster@<domain> <user@domain>
 ./setup.sh -Z config dkim
 ```
 
diff --git a/target/postfix/main.cf b/target/postfix/main.cf
index 99be7f15..c6dfe215 100644
--- a/target/postfix/main.cf
+++ b/target/postfix/main.cf
@@ -10,6 +10,8 @@ readme_directory = no
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 mydestination = $myhostname, localhost.$mydomain, localhost
+# Uncomment for container accounts to masquerade as the domain instead of the host
+# myorigin = $mydomain
 relayhost =
 mynetworks = 127.0.0.0/8 [::1]/128 [fe80::]/64
 mailbox_size_limit = 0