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

Fix bug in how the email 'client' is edited. 

We must match the entire row to make sure to search/replace the correct
place when other values collide with the specified default.

In this instance, if EMAIL_AUTH is false, both username and password
gets specified to 'null', which was previously included in seds range
for searching-and-replacing 'null' occurances to EMAIL_CLIENT.
This commit is contained in:
Björn Zettergren 2018-01-15 15:52:14 +01:00
parent 8b218f18db
commit 5f83381cd8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/docker-entrypoint.sh
View File

@ -132,7 +132,7 @@ email_setup() {
sed -i "0,/"$default_password"/s:"$default_password":'${EMAIL_PASSWORD:-email_password}':" $email_config sed -i "0,/"$default_password"/s:"$default_password":'${EMAIL_PASSWORD:-email_password}':" $email_config
fi fi
if [ -n "$EMAIL_CLIENT" ] ; then if [ -n "$EMAIL_CLIENT" ] ; then
sed -i "0,/"$default_client"/s:"$default_client":'$EMAIL_CLIENT':" $email_config sed -i "0,/'client'/s:'client' => $default_client:'client' => '$EMAIL_CLIENT':" $email_config
fi fi
sed -i "0,/tls/s:false:${EMAIL_TLS:-false}:" $email_config sed -i "0,/tls/s:false:${EMAIL_TLS:-false}:" $email_config