Better logging, better config

amavis/Dockerfile

@@ -21,6 +21,7 @@ RUN su - amavis -s /bin/bash && razor-admin -create && razor-admin -register &&
 COPY ./config/05-node_id /etc/amavis/conf.d/05-node_id
 COPY ./config/15-content_filter_mode /etc/amavis/conf.d/15-content_filter_mode
 COPY ./config/50-user /etc/amavis/conf.d/50-user
+COPY ./config/rsyslog.conf /etc/rsyslog.conf
 
 # Nice place for your settings
 VOLUME ["/mail_settings"]
@@ -32,4 +33,4 @@ RUN chmod 755 /boot
 ENV AMAVIS=true
 
 EXPOSE 10024
-ENTRYPOINT ./boot; amavisd-new foreground
+ENTRYPOINT ./boot; amavisd-new; rsyslogd -n

amavis/boot

@@ -14,10 +14,3 @@ sed "/# DOCKERMAIL DOMAINS START/,/# DOCKERMAIL DOMAINS END/{//!d}" /etc/amavis/
 sed "/# DOCKERMAIL DOMAINS START/,/# DOCKERMAIL DOMAINS END/{//!d}" /etc/amavis/conf.d/50-user -i
 sed "/# DOCKERMAIL DOMAINS START/a $first_fqdn" /etc/amavis/conf.d/05-node_id -i
 sed "/# DOCKERMAIL DOMAINS START/a $domain_acl" /etc/amavis/conf.d/50-user -i
-
-
-ln -sf /dev/stdout /var/log/razor-agent.log
-ln -sf /dev/stdout /var/log/mail.log
-ln -sf /dev/stdout /var/log/mail.info
-ln -sf /dev/stdout /var/log/mail.warn
-ln -sf /dev/stderr /var/log/mail.err

amavis/config/50-user

@@ -18,8 +18,8 @@ $notify_method = $forward_method;
 
 # Bind on all interfaces (needed to expose this to linked containers)
 $inet_socket_bind = '0.0.0.0';
-# Accept incoming requests from all addresses (change if used outside of linked containers!)
-@inet_acl = qw( ::/0 );
+# Accept incoming requests from private ip range
+@inet_acl = qw(172.0.0.0/8);
 
 #------------ Do not modify anything below this line -------------
 1;  # ensure a defined return

amavis/config/rsyslog.conf

@@ -0,0 +1,28 @@
+#  /etc/rsyslog.conf    Configuration file for rsyslog.
+#
+#                       For more information see
+#                       /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+#
+#  Default logging rules can be found in /etc/rsyslog.d/50-default.conf
+
+
+#################
+#### MODULES ####
+#################
+
+$ModLoad imuxsock # provides support for local system logging
+
+###########################
+#### GLOBAL DIRECTIVES ####
+###########################
+
+# Filter duplicated messages
+$RepeatedMsgReduction on
+#
+# Where to place spool and state files
+#
+$WorkDirectory /var/spool/rsyslog
+
+# Write everything to stdout
+$template fmt,"%timestamp:::date-rfc3164%\n"
+*.* /dev/stdout