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

Merge branch 'ajcamilo-master'

This commit is contained in:
Diego Lendoiro 2018-01-14 16:31:30 +01:00
parent 5e205c5468 760322e55f
commit 450999cd94
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -76,7 +76,7 @@ Passbolt docker image provides several environment variables to configure differ
* SALT: a random string used by cakephp in security hashing methods
* CIPHERSEED: a random string used by cakephp to encrypt/decrypt strings
* URL: URL of the passbolt installation (defaults to passbolt.local)
* URL: URL of the passbolt installation (defaults to http://passbolt.local)
### Database variables

7
bin/docker-entrypoint.sh
View File

@ -45,16 +45,13 @@ core_setup() {
local default_salt='DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi'
local default_seed='76859309657453542496749683645'
local default_url='passbolt.local'
local default_url='http://passbolt.local'
cp $core_config{.default,}
sed -i s:$default_salt:${SALT:-$default_salt}:g $core_config
sed -i s:$default_seed:${CIPHERSEED:-$default_seed}:g $core_config
sed -i "/example.com/ s:\/\/::" $core_config
sed -i s:example.com:${URL:-$default_url}:g $core_config
if [ "${SSL:-true}" != false ]; then
sed -i s:http:https:g $core_config
fi
sed -i "s|http://example.com|${URL:-$default_url}|g" $core_config
}
db_setup() {