mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-03 09:34:33 +02:00
Merge branch 'master' into macos-linting-support
This commit is contained in:
commit
c4d2605790
6 changed files with 62 additions and 95 deletions
|
@ -5,8 +5,9 @@ function setup_file() {
|
|||
docker build -f Dockerfile -t ldap --no-cache .
|
||||
popd || return 1
|
||||
|
||||
export FQDN_MAIL='mail.my-domain.com'
|
||||
export FQDN_LDAP='ldap.my-domain.com'
|
||||
export DOMAIN='my-domain.com'
|
||||
export FQDN_MAIL="mail.${DOMAIN}"
|
||||
export FQDN_LDAP="ldap.${DOMAIN}"
|
||||
export FQDN_LOCALHOST_A='localhost.localdomain'
|
||||
export FQDN_LOCALHOST_B='localhost.otherdomain'
|
||||
export DMS_TEST_NETWORK='test-network-ldap'
|
||||
|
@ -33,6 +34,7 @@ function setup_file() {
|
|||
-e DOVECOT_TLS=no \
|
||||
-e DOVECOT_USER_FILTER="(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))" \
|
||||
-e ENABLE_LDAP=1 \
|
||||
-e PFLOGSUMM_TRIGGER=logrotate \
|
||||
-e ENABLE_SASLAUTHD=1 \
|
||||
-e LDAP_BIND_DN=cn=admin,dc=localhost,dc=localdomain \
|
||||
-e LDAP_BIND_PW=admin \
|
||||
|
@ -228,11 +230,11 @@ function teardown_file() {
|
|||
|
||||
@test "checking pflogsum delivery" {
|
||||
# checking default sender is correctly set when env variable not defined
|
||||
run docker exec mail_with_ldap grep "mailserver-report@${FQDN_MAIL}" /etc/logrotate.d/maillog
|
||||
run docker exec mail_with_ldap grep "mailserver-report@${DOMAIN}" /etc/logrotate.d/maillog
|
||||
assert_success
|
||||
|
||||
# checking default logrotation setup
|
||||
run docker exec mail_with_ldap grep "daily" /etc/logrotate.d/maillog
|
||||
run docker exec mail_with_ldap grep "weekly" /etc/logrotate.d/maillog
|
||||
assert_success
|
||||
}
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@ setup_file() {
|
|||
-e ENABLE_QUOTAS=1 \
|
||||
-e ENABLE_SPAMASSASSIN=1 \
|
||||
-e ENABLE_SRS=1 \
|
||||
-e PFLOGSUMM_TRIGGER=logrotate \
|
||||
-e ENABLE_UPDATE_CHECK=0 \
|
||||
-e PERMIT_DOCKER=container \
|
||||
-e PERMIT_DOCKER=host \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue