From c030840771bcb79c588f527d10ea7108d637ab57 Mon Sep 17 00:00:00 2001 From: Val Date: Wed, 15 Jul 2015 00:01:41 +0100 Subject: [PATCH] Fixing amavis startup, still a config issue --- amavis/Dockerfile | 2 +- amavis/boot | 4 ++++ amavis/config/15-content_filter_mode | 4 ++-- opendkim/Dockerfile | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/amavis/Dockerfile b/amavis/Dockerfile index 25e5722..3d8b949 100644 --- a/amavis/Dockerfile +++ b/amavis/Dockerfile @@ -31,4 +31,4 @@ ENV AMAVIS=true EXPOSE 10024 -ENTRYPOINT ./boot; service rsyslog start; amavisd foreground +ENTRYPOINT ./boot; service rsyslog start; amavisd-new foreground diff --git a/amavis/boot b/amavis/boot index ad4f96e..675eefb 100644 --- a/amavis/boot +++ b/amavis/boot @@ -1,5 +1,9 @@ #!/bin/bash +if [ -f /mail_settings/myhostname ]; then + echo $(sed 's:/:\\/:g' /mail_settings/myhostname) > /etc/mailname +fi + readarray -t domains < /mail_settings/domains domain_suffix=$(printf ", \"%s\"" "${domains[@]}") domain_string="@local_domains_acl = ( \".$mydomain\" $domain_suffix );" diff --git a/amavis/config/15-content_filter_mode b/amavis/config/15-content_filter_mode index 4812090..d379241 100644 --- a/amavis/config/15-content_filter_mode +++ b/amavis/config/15-content_filter_mode @@ -21,7 +21,7 @@ use strict; # If You wish to enable it, please uncomment the following lines: -bypass_spam_checks_maps = ( - \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re); +@bypass_spam_checks_maps = ( + \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re); 1; # ensure a defined return diff --git a/opendkim/Dockerfile b/opendkim/Dockerfile index dbf8454..0de1420 100644 --- a/opendkim/Dockerfile +++ b/opendkim/Dockerfile @@ -20,4 +20,4 @@ ENV OPEN_DKIM=true EXPOSE 8891 -ENTRYPOINT /boot; service rsyslog start; opendkim -f -p inet:8891 +ENTRYPOINT /boot; service rsyslog start; opendkim -f -p inet:8891@0.0.0.0