Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

turn URL config independent from SSL var #76

Merged
merged 1 commit into from
Jan 14, 2018
Merged

turn URL config independent from SSL var #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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
View file
Open in desktop
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