From 9d5a39213d8bec8ee527f94df654da5384116a6b Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Sat, 24 Jun 2017 21:16:41 +0200
Subject: [PATCH 1/4] remove app baseurl comment

---
 bin/docker-entrypoint.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 98720d0..98e75d4 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -50,6 +50,7 @@ core_setup() {
   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 "/$default_url/ s:\/\/::" $core_config
   sed -i s:$default_url:${url:-$default_url}:g $core_config
 }
 

From 7a154fd965bca7fec78ed781182b1ae5582dfaa6 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 16:03:18 +0200
Subject: [PATCH 2/4] useless local variable

---
 bin/docker-entrypoint.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 98e75d4..416625c 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -45,7 +45,7 @@ core_setup() {
 
   local default_salt='DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi'
   local default_seed='76859309657453542496749683645'
-  local default_url='example.com'
+  local default_url='http://example.com'
 
   cp $core_config{.default,}
   sed -i s:$default_salt:${salt:-$default_salt}:g $core_config
@@ -83,7 +83,6 @@ app_setup() {
   local default_public_key='unsecure.key'
   local default_private_key='unsecure_private.key'
   local default_fingerprint='2FC8945833C51946E937F9FED47B0811573EE67E'
-  local default_ssl='force'
   local default_registration='public'
   local gpg_home='/var/lib/nginx/.gnupg'
   local auto_fingerprint=$(su -m -c "$gpg --fingerprint |grep fingerprint| awk '{for(i=4;i<=NF;++i)printf \$i}'" -ls /bin/bash nginx)

From b566f4fed4a83d849f248c7e9acff016d453a441 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 16:11:47 +0200
Subject: [PATCH 3/4] set the protocol, https unless ssl env var declared false

---
 bin/docker-entrypoint.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 416625c..5f86c2f 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -51,7 +51,11 @@ core_setup() {
   sed -i s:$default_salt:${salt:-$default_salt}:g $core_config
   sed -i s:$default_seed:${cipherseed:-$default_seed}:g $core_config
   sed -i "/$default_url/ s:\/\/::" $core_config
-  sed -i s:$default_url:${url:-$default_url}:g $core_config
+  if [ "$ssl" = false ]; then
+    sed -i s:$default_url:http://${url:-$default_url}:g $core_config
+  else
+    sed -i s:$default_url:https://${url:-$default_url}:g $core_config
+  fi
 }
 
 db_setup() {

From 3fbf44fc0c475c6be9ff3bb37620cee9fa7e786e Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 16:30:55 +0200
Subject: [PATCH 4/4] fullbaseurl configuration param fixed.

---
 bin/docker-entrypoint.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 5f86c2f..62d3cb0 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -45,16 +45,15 @@ core_setup() {
 
   local default_salt='DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi'
   local default_seed='76859309657453542496749683645'
-  local default_url='http://example.com'
+  local default_url='example.com'
 
   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 "/$default_url/ s:\/\/::" $core_config
-  if [ "$ssl" = false ]; then
-    sed -i s:$default_url:http://${url:-$default_url}:g $core_config
-  else
-    sed -i s:$default_url:https://${url:-$default_url}:g $core_config
+  sed -i s:$default_url:${url:-$default_url}:g $core_config
+  if [ "$ssl" != false ]; then
+    sed -i s:http:https:g $core_config
   fi
 }