hasufell/exherbo-dockermail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing amavis startup, still a config issue

Browse Source
This commit is contained in:
Val 2015-07-15 00:01:41 +01:00
parent 47e32fceb0
commit c030840771
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amavis/Dockerfile
View File

@ -31,4 +31,4 @@ ENV AMAVIS=true
EXPOSE 10024 EXPOSE 10024
ENTRYPOINT ./boot; service rsyslog start; amavisd foreground ENTRYPOINT ./boot; service rsyslog start; amavisd-new foreground

4
amavis/boot
View File

@ -1,5 +1,9 @@
#!/bin/bash #!/bin/bash
if [ -f /mail_settings/myhostname ]; then
echo $(sed 's:/:\\/:g' /mail_settings/myhostname) > /etc/mailname
fi
readarray -t domains < /mail_settings/domains readarray -t domains < /mail_settings/domains
domain_suffix=$(printf ", \"%s\"" "${domains[@]}") domain_suffix=$(printf ", \"%s\"" "${domains[@]}")
domain_string="@local_domains_acl = ( \".$mydomain\" $domain_suffix );" domain_string="@local_domains_acl = ( \".$mydomain\" $domain_suffix );"

2
amavis/config/15-content_filter_mode
View File

@ -21,7 +21,7 @@ use strict;
# If You wish to enable it, please uncomment the following lines: # If You wish to enable it, please uncomment the following lines:
bypass_spam_checks_maps = ( @bypass_spam_checks_maps = (
\%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re); \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re);
1; # ensure a defined return 1; # ensure a defined return

2
opendkim/Dockerfile
View File

@ -20,4 +20,4 @@ ENV OPEN_DKIM=true
EXPOSE 8891 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