Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed variable assignment

This commit is contained in:
Thomas VIAL 2017-01-01 20:44:51 +01:00
parent f0cf862cec
commit 7a6f8c34c4
No known key found for this signature in database
GPG Key ID: 0394CEE552FAFEFC
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/start-mailserver.sh
View File

@ -7,18 +7,18 @@
# Example: DEFAULT_VARS["KEY"]="VALUE" # Example: DEFAULT_VARS["KEY"]="VALUE"
########################################################################## ##########################################################################
declare -A DEFAULT_VARS declare -A DEFAULT_VARS
DEFAULT_VARS["ENABLE_CLAMAV"]=${ENABLE_CLAMAV:=0} DEFAULT_VARS["ENABLE_CLAMAV"]=${ENABLE_CLAMAV:-0}
DEFAULT_VARS["ENABLE_SPAMASSASSIN"]=${ENABLE_SPAMASSASSIN:=0} DEFAULT_VARS["ENABLE_SPAMASSASSIN"]=${ENABLE_SPAMASSASSIN:-0}
DEFAULT_VARS["ENABLE_POP3"]=${ENABLE_POP3:=0} DEFAULT_VARS["ENABLE_POP3"]=${ENABLE_POP3:-0}
DEFAULT_VARS["ENABLE_FAIL2BAN"]=${ENABLE_FAIL2BAN:=0} DEFAULT_VARS["ENABLE_FAIL2BAN"]=${ENABLE_FAIL2BAN:-0}
DEFAULT_VARS["ENABLE_MANAGESIEVE"]=${ENABLE_MANAGESIEVE:=0} DEFAULT_VARS["ENABLE_MANAGESIEVE"]=${ENABLE_MANAGESIEVE:-0}
DEFAULT_VARS["ENABLE_FETCHMAIL"]=${ENABLE_FETCHMAIL:=0} DEFAULT_VARS["ENABLE_FETCHMAIL"]=${ENABLE_FETCHMAIL:-0}
DEFAULT_VARS["ENABLE_LDAP"]=${ENABLE_LDAP:=0} DEFAULT_VARS["ENABLE_LDAP"]=${ENABLE_LDAP:-0}
DEFAULT_VARS["ENABLE_SASLAUTHD"]=${ENABLE_SASLAUTHD:=0} DEFAULT_VARS["ENABLE_SASLAUTHD"]=${ENABLE_SASLAUTHD:-0}
DEFAULT_VARS["ONE_DIR"]=${ONE_DIR:=0} DEFAULT_VARS["ONE_DIR"]=${ONE_DIR:-0}
DEFAULT_VARS["SMTP_ONLY"]=${SMTP_ONLY:=0} DEFAULT_VARS["SMTP_ONLY"]=${SMTP_ONLY:-0}
DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]=${VIRUSMAILS_DELETE_DELAY:=7} DEFAULT_VARS["VIRUSMAILS_DELETE_DELAY"]=${VIRUSMAILS_DELETE_DELAY:-7}
DEFAULT_VARS["DMS_DEBUG"]=${DMS_DEBUG:=0} DEFAULT_VARS["DMS_DEBUG"]=${DMS_DEBUG:-0}
########################################################################## ##########################################################################
# << DEFAULT VARS # << DEFAULT VARS
########################################################################## ##########################################################################

8
test/tests.bats
View File

@ -7,7 +7,7 @@ load 'test_helper/bats-assert/load'
@test "checking configuration: hostname/domainname" { @test "checking configuration: hostname/domainname" {
run docker run `docker inspect --format '{{ .Config.Image }}' mail` run docker run `docker inspect --format '{{ .Config.Image }}' mail`
assert_success assert_failure
} }
# #
@ -265,7 +265,7 @@ load 'test_helper/bats-assert/load'
if [ $ENABLE_SPAMASSASSIN -eq 0 ]; then if [ $ENABLE_SPAMASSASSIN -eq 0 ]; then
skip skip
fi fi
run docker exec mail /bin/sh -c "grep 'Blocked SPAM' /var/log/mail/mail.log | grep spam@external.tld | wc -l" run docker exec mail /bin/sh -c "grep 'Blocked SPAM' /var/log/mail/mail.log | wc -l"
assert_output 1 assert_output 1
} }
@ -273,7 +273,7 @@ load 'test_helper/bats-assert/load'
if [ $ENABLE_CLAMAV -eq 0 ]; then if [ $ENABLE_CLAMAV -eq 0 ]; then
skip skip
fi fi
run docker exec mail /bin/sh -c "grep 'Blocked INFECTED' /var/log/mail/mail.log | grep virus@external.tld | wc -l" run docker exec mail /bin/sh -c "grep 'Blocked INFECTED' /var/log/mail/mail.log | wc -l"
assert_output 1 assert_output 1
} }
@ -789,11 +789,9 @@ load 'test_helper/bats-assert/load'
run docker exec mail /bin/sh -c "grep user3@domain.tld -i /tmp/docker-mailserver/postfix-accounts.cf" run docker exec mail /bin/sh -c "grep user3@domain.tld -i /tmp/docker-mailserver/postfix-accounts.cf"
assert_failure assert_failure
[ -z "$output" ]
run docker exec mail /bin/sh -c "grep '^auser3@domain\.tld' -i /tmp/docker-mailserver/postfix-accounts.cf" run docker exec mail /bin/sh -c "grep '^auser3@domain\.tld' -i /tmp/docker-mailserver/postfix-accounts.cf"
assert_success assert_success
[ ! -z "$output" ]
} }
@test "checking user updating password for user in /tmp/docker-mailserver/postfix-accounts.cf" { @test "checking user updating password for user in /tmp/docker-mailserver/postfix-accounts.cf" {