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

Merge branch 'feature/PASSBOLT-2165' into develop 

Adds TLS support. Fixes #25
This commit is contained in:
Diego Lendoiro 2017-06-28 17:04:51 +02:00
parent 50b7fa3347 d046022544
commit 189732d2aa
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -92,6 +92,7 @@ Passbolt docker image provides several environment variables to configure differ
* email_timeout: timeout ( defaults to 30s) * email_timeout: timeout ( defaults to 30s)
* 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)
## Advanced configuration ## Advanced configuration

5
bin/docker-entrypoint.sh
View File

@ -107,6 +107,7 @@ email_setup() {
# email_timeout # email_timeout
# email_username # email_username
# email_password # email_password
# email_tls
local default_transport='Smtp' local default_transport='Smtp'
local default_from='contact@passbolt.com' local default_from='contact@passbolt.com'
@ -123,7 +124,9 @@ email_setup() {
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 sed -i "0,/"$default_username"/s:"$default_username":'${email_username:-email_user}':" $email_config
sed -i "0,/"$default_username"/s:"$default_password":'${email_password:-email_password}':" $email_config sed -i "0,/"$default_password"/s:"$default_password":'${email_password:-email_password}':" $email_config
sed -i "0,/tls/s:false:'${email_tls:-false}':" $email_config
} }
gen_ssl_cert() { gen_ssl_cert() {