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

Fixed typos

This commit is contained in:
Thomas VIAL 2016-12-27 20:37:45 +01:00
parent b01e6b285f
commit ef22c070fc
No known key found for this signature in database
GPG Key ID: 0394CEE552FAFEFC
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -12,8 +12,8 @@ script:
after_script:
- make clean
env:
- ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 ENABLE_MANAGESIEVE=1 PERMIT_DOCKER=host DMS_DEBUG=0 SASL_PASSWD="external domain.com username:password"
- ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 SA_TAG= SA_TAG2= SA_KILL= VIRUSMAILS_DELETE_DELAY= ENABLE_MANAGESIEVE=0 PERMIT_DOCKER=network DMS_DEBUG=0
- ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 ENABLE_POP3=1 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 ENABLE_MANAGESIEVE=1 ENABLE_FETCHMAIL= 1 PERMIT_DOCKER=host DMS_DEBUG=0 SASL_PASSWD="external domain.com username:password"
- ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 ENABLE_POP3=0 SA_TAG= SA_TAG2= SA_KILL= VIRUSMAILS_DELETE_DELAY= ENABLE_MANAGESIEVE=0 ENABLE_FETCHMAIL= 0 PERMIT_DOCKER=network DMS_DEBUG=0
notifications:
slack:

6
test/tests.bats
View File

@ -358,7 +358,7 @@
}
@test "checking spamassassin: docker env variables are set correctly (default)" {
if [ "$ENABLE_SPAMASSASSIN" -eq 0 || ! -z $SA_TAG ]; then
if [ "$ENABLE_SPAMASSASSIN" -eq 0 -a ! -z $SA_TAG ]; then
skip
fi
run docker exec mail /bin/sh -c "grep '\$sa_tag_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 2.0'"
@ -370,7 +370,7 @@
}
@test "checking spamassassin: docker env variables are set correctly (custom)" {
if [ "$ENABLE_SPAMASSASSIN" -eq 1 || -z $SA_TAG ]; then
if [ "$ENABLE_SPAMASSASSIN" -eq 1 -a -z $SA_TAG ]; then
skip
fi
run docker exec mail /bin/sh -c "grep '\$sa_tag_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 1.0'"
@ -663,7 +663,7 @@
# fetchmail
#
@test "checking fetchmail: gerneral options in fetchmailrc are loaded" {
@test "checking fetchmail: general options in fetchmailrc are loaded" {
if [ "$ENABLE_FETCHMAIL" -eq 0 ]; then
skip
fi