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

Moved printenv and changed default var export

This commit is contained in:
Thomas VIAL 2017-01-01 20:54:53 +01:00
parent 412ce1681c
commit 54394d1ae9
No known key found for this signature in database
GPG Key ID: 0394CEE552FAFEFC
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -58,8 +58,6 @@ endif
--cap-add=NET_ADMIN \ --cap-add=NET_ADMIN \
-h mail.my-domain.com -t $(NAME) -h mail.my-domain.com -t $(NAME)
docker exec mail printenv
# Wait for containers to fully start # Wait for containers to fully start
sleep 15 sleep 15
@ -76,6 +74,7 @@ run-local:
sleep 15 sleep 15
fixtures: fixtures:
docker exec mail printenv
cp config/postfix-accounts.cf config/postfix-accounts.cf.bak cp config/postfix-accounts.cf config/postfix-accounts.cf.bak
# Setup sieve & create filtering folder (INBOX/spam) # Setup sieve & create filtering folder (INBOX/spam)
docker cp "`pwd`/test/config/sieve/dovecot.sieve" mail:/var/mail/localhost.localdomain/user1/.dovecot.sieve docker cp "`pwd`/test/config/sieve/dovecot.sieve" mail:/var/mail/localhost.localdomain/user1/.dovecot.sieve

2
target/start-mailserver.sh
View File

@ -334,7 +334,7 @@ function _setup_default_vars() {
notify 'task' "Setting up default variables [$FUNCNAME]" notify 'task' "Setting up default variables [$FUNCNAME]"
for var in ${!DEFAULT_VARS[@]}; do for var in ${!DEFAULT_VARS[@]}; do
echo "export $var=${DEFAULT_VARS[$var]}" >> /root/.bashrc echo "export $var=${DEFAULT_VARS[$var]}"
[ $? != 0 ] && notify 'err' "Unable to set $var=${DEFAULT_VARS[$var]}" && return 1 [ $? != 0 ] && notify 'err' "Unable to set $var=${DEFAULT_VARS[$var]}" && return 1
notify 'inf' "Set $var=${DEFAULT_VARS[$var]}" notify 'inf' "Set $var=${DEFAULT_VARS[$var]}"
done done