Skip to content

Commit

Permalink
turn URL config independent from SSL var
Browse files Browse the repository at this point in the history
  • Loading branch information
ajcamilo committed Nov 21, 2017
1 parent 5e205c5 commit 760322e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 2 additions & 5 deletions bin/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 760322e

Please sign in to comment.