CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'justb81-patch-1'

This commit is contained in:
Diego Lendoiro 2017-11-14 11:24:27 +01:00
parent 9f3d2a91d7 2623a3742c
commit a26f2fbb0b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -93,6 +93,7 @@ Passbolt docker image provides several environment variables to configure differ
* EMAIL_HOST: server hostname ( defaults to localhost) * EMAIL_HOST: server hostname ( defaults to localhost)
* EMAIL_PORT: server port ( defaults to 587) * EMAIL_PORT: server port ( defaults to 587)
* EMAIL_TIMEOUT: timeout ( defaults to 30s) * EMAIL_TIMEOUT: timeout ( defaults to 30s)
* EMAIL_AUTH: disable smtp auth ( defaults to true)
* EMAIL_USERNAME: username for email server auth ( defaults to email_user) * EMAIL_USERNAME: username for email server auth ( defaults to email_user)
* EMAIL_PASSWORD: password for email server auth ( defaults to email_password) * EMAIL_PASSWORD: password for email server auth ( defaults to email_password)
* EMAIL_TLS: set tls, boolean ( defaults to false) * EMAIL_TLS: set tls, boolean ( defaults to false)

11
bin/docker-entrypoint.sh
View File

@ -106,6 +106,7 @@ email_setup() {
# EMAIL_HOST # EMAIL_HOST
# EMAIL_PORT # EMAIL_PORT
# EMAIL_TIMEOUT # EMAIL_TIMEOUT
# EMAIL_AUTH
# EMAIL_USERNAME # EMAIL_USERNAME
# EMAIL_PASSWORD # EMAIL_PASSWORD
# EMAIL_TLS # EMAIL_TLS
@ -124,8 +125,14 @@ email_setup() {
sed -i s:$default_host:${EMAIL_HOST:-localhost}:g $email_config sed -i s:$default_host:${EMAIL_HOST:-localhost}:g $email_config
sed -i s:$default_port:${EMAIL_PORT:-587}:g $email_config sed -i s:$default_port:${EMAIL_PORT:-587}:g $email_config
sed -i s:$default_timeout:${EMAIL_TIMEOUT:-30}:g $email_config sed -i s:$default_timeout:${EMAIL_TIMEOUT:-30}:g $email_config
sed -i "0,/"$default_username"/s:"$default_username":'${EMAIL_USERNAME:-email_user}':" $email_config if [ "$EMAIL_AUTH" = "false" ] ; then
sed -i "0,/"$default_password"/s:"$default_password":'${EMAIL_PASSWORD:-email_password}':" $email_config sed -i "0,/"$default_username"/s:"$default_username":null:" $email_config
sed -i "0,/"$default_password"/s:"$default_password":null:" $email_config
else
sed -i "0,/"$default_username"/s:"$default_username":'${EMAIL_USERNAME:-email_user}':" $email_config
sed -i "0,/"$default_password"/s:"$default_password":'${EMAIL_PASSWORD:-email_password}':" $email_config
fi
sed -i "0,/tls/s:false:${EMAIL_TLS:-false}:" $email_config sed -i "0,/tls/s:false:${EMAIL_TLS:-false}:" $email_config
} }