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 01/12] 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 02/12] 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 03/12] 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 04/12] 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
 }
 

From 50b7fa3347c13a601056dea6d0205d8e6d300b70 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 16:32:50 +0200
Subject: [PATCH 05/12] email_transport typo and updated README. Fixes #24

---
 README.md                | 2 +-
 bin/docker-entrypoint.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b733aa5..20995a5 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Passbolt docker image provides several environment variables to configure differ
 
 ### Email variables
 
-* email_tansport: transport protocol             ( defaults to Smtp)
+* email_transport: transport protocol             ( defaults to Smtp)
 * email_from:     from email address             ( defaults to contact@mydomain.local)
 * email_host:     server hostname                ( defaults to localhost)
 * email_port:     server port                    ( defaults to 587)
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 62d3cb0..6dae32b 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -100,7 +100,7 @@ app_setup() {
 
 email_setup() {
   #Env vars:
-  # email_tansport
+  # email_transport
   # email_from
   # email_host
   # email_port
@@ -117,7 +117,7 @@ email_setup() {
   local default_password="''"
 
   cp $email_config{.default,}
-  sed -i s:$default_transport:${email_tansport:-Smtp}:g $email_config
+  sed -i s:$default_transport:${email_transport:-Smtp}:g $email_config
   sed -i s:$default_from:${email_from:-contact@mydomain.local}:g $email_config
   sed -i s:$default_host:${email_host:-localhost}:g $email_config
   sed -i s:$default_port:${email_port:-587}:g $email_config

From 2cd079cd11c4f5f19350e673719d03cee38631dd Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 16:37:21 +0200
Subject: [PATCH 06/12] variable name corrected

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

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 6dae32b..3716aca 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -107,6 +107,7 @@ email_setup() {
   # email_timeout
   # email_username
   # email_password
+  # email_tls
 
   local default_transport='Smtp'
   local default_from='contact@passbolt.com'
@@ -123,7 +124,8 @@ email_setup() {
   sed -i s:$default_port:${email_port:-587}:g $email_config
   sed -i s:$default_timeout:${email_timeout:-30}:g $email_config
   sed -i "0,/"$default_username"/s:"$default_username":'${email_username:-email_user}':" $email_config
-  sed -i "0,/"$default_username"/s:"$default_password":'${email_password:-email_password}':" $email_config
+  sed -i "0,/"$default_password"/s:"$default_password":'${email_password:-email_password}':" $email_config
+
 }
 
 gen_ssl_cert() {

From d04602254469be599c31c43174c49274c18201a1 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 17:04:46 +0200
Subject: [PATCH 07/12] added tls support

---
 README.md                | 1 +
 bin/docker-entrypoint.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 20995a5..82fb30d 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ Passbolt docker image provides several environment variables to configure differ
 * email_timeout:  timeout                        ( defaults to 30s)
 * email_username: username for email server auth ( defaults to email_user)
 * email_password: password for email server auth ( defaults to email_password)
+* email_tls:      set tls, boolean               ( defaults to false)
 
 ## Advanced configuration
 
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 3716aca..3cbe644 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -125,6 +125,7 @@ email_setup() {
   sed -i s:$default_timeout:${email_timeout:-30}:g $email_config
   sed -i "0,/"$default_username"/s:"$default_username":'${email_username:-email_user}':" $email_config
   sed -i "0,/"$default_password"/s:"$default_password":'${email_password:-email_password}':" $email_config
+  sed -i "0,/tls/s:false:'${email_tls:-false}':" $email_config
 
 }
 

From 23b4647b3fdcc347f27e215d02839a8029655cde Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 17:25:36 +0200
Subject: [PATCH 08/12] updated changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a11bb64..8f0d11d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+- PASSBOLT-2158: corrected management of fullbaseurl throug url env variable
+- PASSBOLT-2164: corrected typo on email_transport env variable
+
+### Added
+
+- PASSBOLT-2165: Added TLS support through email_tls env variable
+
 ## [1.6.0] - 2017-06-23
 ### Added
 - Added email set up support though environment variables

From 64679be9469a95148631fb7d53503aabea7c427e Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 17:49:08 +0200
Subject: [PATCH 09/12] added server_name param to php-fpm. Fixes #19

---
 CHANGELOG.md       | 1 +
 conf/passbolt.conf | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f0d11d..4324e31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - PASSBOLT-2158: corrected management of fullbaseurl throug url env variable
 - PASSBOLT-2164: corrected typo on email_transport env variable
+- PASSBOLT-2166: http to https redirection fixed
 
 ### Added
 
diff --git a/conf/passbolt.conf b/conf/passbolt.conf
index 57df81e..af68783 100644
--- a/conf/passbolt.conf
+++ b/conf/passbolt.conf
@@ -36,6 +36,7 @@ server {
     fastcgi_split_path_info ^(.+\.php)(.+)$;
     include                 fastcgi_params;
     fastcgi_param           SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param           SERVER_NAME $http_host;
   }
 
   location ~* \.(jpe?g|woff|woff2|ttf|gif|png|bmp|ico|css|js|json|pdf|zip|htm|html|docx?|xlsx?|pptx?|txt|wav|swf|svg|avi|mp\d)$ {
@@ -86,6 +87,7 @@ server {
     fastcgi_split_path_info ^(.+\.php)(.+)$;
     include                 fastcgi_params;
     fastcgi_param           SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    fastcgi_param           SERVER_NAME $http_host;
   }
 
   location ~* \.(jpe?g|woff|woff2|ttf|gif|png|bmp|ico|css|js|json|pdf|zip|htm|html|docx?|xlsx?|pptx?|txt|wav|swf|svg|avi|mp\d)$ {

From 8a9dedae908bbb784788da23a072cb0b0d89f7f0 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 19:17:51 +0200
Subject: [PATCH 10/12] added php5-posix package. Fixes #26

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index cf405db..f52ceed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,7 @@ ARG BASE_PHP_DEPS="php5-curl \
       php5-xsl \
       php5-fpm \
       php5-phar \
+      php5-posix \
       php5-xml \
       php5-openssl \
       php5-zlib \

From 3b3223e80f7783e237c70e1cc2775248de26600d Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Wed, 28 Jun 2017 19:21:27 +0200
Subject: [PATCH 11/12] updated CHANGELOG

---
 CHANGELOG.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4324e31..3ea9f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Fixed
-- PASSBOLT-2158: corrected management of fullbaseurl throug url env variable
-- PASSBOLT-2164: corrected typo on email_transport env variable
-- PASSBOLT-2166: http to https redirection fixed
+- PASSBOLT-2158: corrected management of fullbaseurl throug url env variable.
+- PASSBOLT-2164: corrected typo on email_transport env variable. #24
+- PASSBOLT-2166: http to https redirection fixed. #19
+- PASSBOLT-2167: healthcheck does not work on container. #26
 
 ### Added
 
-- PASSBOLT-2165: Added TLS support through email_tls env variable
+- PASSBOLT-2165: Added TLS support through email_tls env variable. #25
 
 ## [1.6.0] - 2017-06-23
 ### Added

From 74fdc414c11799ca6079b617f951d5d171cc759b Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 29 Jun 2017 09:20:48 +0200
Subject: [PATCH 12/12] Updated changelog

---
 CHANGELOG.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ea9f04..e8d78d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,19 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [Unreleased](https://github.com/passbolt/passbolt_api/compare/v1.6.1...HEAD)
 
+## [1.6.1](https://github.com/passbolt/passbolt_api/compare/v1.6.0...v1.6.1) - 2017-06-29
 ### Fixed
 - PASSBOLT-2158: corrected management of fullbaseurl throug url env variable.
-- PASSBOLT-2164: corrected typo on email_transport env variable. #24
-- PASSBOLT-2166: http to https redirection fixed. #19
-- PASSBOLT-2167: healthcheck does not work on container. #26
+- PASSBOLT-2164: corrected typo on email_transport env variable. [#24](https://github.com/passbolt/passbolt_docker/issues/24)
+- PASSBOLT-2166: http to https redirection fixed. [#19](https://github.com/passbolt/passbolt_docker/issues/19)
+- PASSBOLT-2167: healthcheck does not work on container. [#26](https://github.com/passbolt/passbolt_docker/issues/26)
 
 ### Added
 
-- PASSBOLT-2165: Added TLS support through email_tls env variable. #25
+- PASSBOLT-2165: Added TLS support through email_tls env variable. [#25](https://github.com/passbolt/passbolt_docker/issues/25)
 
-## [1.6.0] - 2017-06-23
+## [1.6.0](https://github.com/passbolt/passbolt_api/compare/v1.5.1...v1.6.0) - 2017-06-23
 ### Added
 - Added email set up support though environment variables
 - Added cronjob to send queued emails