From 760322e55f75cd00d8e243c19fb5df0797939df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Camilo?= Date: Tue, 21 Nov 2017 15:21:50 +0000 Subject: [PATCH] turn URL config independent from SSL var --- README.md | 2 +- bin/docker-entrypoint.sh | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4a3eb8b..151215b 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh index 0a52c03..b0b2312 100755 --- a/bin/docker-entrypoint.sh +++ b/bin/docker-entrypoint.sh @@ -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() {