mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
Allow user to provide Amavis configuration (#299)
* Add the option of manually specifying paths to SSL certificates * Adding tests for manual SSL changes * Allow user provided configuration of amavis
This commit is contained in:
parent
4e253a098d
commit
02f854f4e9
|
@ -397,6 +397,12 @@ fi
|
|||
if ! [ "$DISABLE_CLAMAV" = 1 ]; then
|
||||
/etc/init.d/clamav-daemon start
|
||||
fi
|
||||
|
||||
# Copy user provided configuration files if provided
|
||||
if [ -f /tmp/docker-mailserver/amavis.cf ]; then
|
||||
cp /tmp/docker-mailserver/amavis.cf /etc/amavis/conf.d/50-user
|
||||
fi
|
||||
|
||||
if ! [ "$DISABLE_AMAVIS" = 1 ]; then
|
||||
/etc/init.d/amavis start
|
||||
fi
|
||||
|
|
14
test/config/amavis.cf
Normal file
14
test/config/amavis.cf
Normal file
|
@ -0,0 +1,14 @@
|
|||
use strict;
|
||||
|
||||
#
|
||||
# Place your configuration directives here. They will override those in
|
||||
# earlier files.
|
||||
#
|
||||
# See /usr/share/doc/amavisd-new/ for documentation and examples of
|
||||
# the directives you can use in this file
|
||||
#
|
||||
|
||||
# Test Verification
|
||||
|
||||
#------------ Do not modify anything below this line -------------
|
||||
1; # ensure a defined return
|
|
@ -661,6 +661,16 @@
|
|||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
#
|
||||
# amavis
|
||||
#
|
||||
|
||||
@test "checking amavis: config overrides" {
|
||||
run docker exec mail /bin/sh -c "grep 'Test Verification' /etc/amavis/conf.d/50-user | wc -l"
|
||||
[ "$status" -eq 0 ]
|
||||
[ "$output" -eq 1 ]
|
||||
}
|
||||
|
||||
#
|
||||
# setup.sh
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue