From ddc34aff48a1162dd07a94df4ea42cac00dc5a8b Mon Sep 17 00:00:00 2001 From: Daniel Del Rio Figueira Date: Fri, 12 Feb 2021 12:53:41 +0100 Subject: [PATCH] Changed: adapt sed command to new passbolt-ssl snippet configuration --- Dockerfile | 3 ++- env/passbolt.env | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1733a9..6bb71d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,8 @@ RUN sed -i 's,listen 80;,listen 8080;,' /etc/nginx/sites-enabled/nginx-passbolt. && cp /usr/share/passbolt/examples/nginx-passbolt-ssl.conf /etc/nginx/snippets/passbolt-ssl.conf \ && sed -i 's,;clear_env = no,clear_env = no,' /etc/php/$PHP_VERSION/fpm/pool.d/www.conf \ && sed -i 's,# include __PASSBOLT_SSL__,include /etc/nginx/snippets/passbolt-ssl.conf;,' /etc/nginx/sites-enabled/nginx-passbolt.conf \ - && sed -i 's,ssl on;,listen 4443 ssl;,' /etc/nginx/snippets/passbolt-ssl.conf \ + && sed -i 's,listen \[\:\:\]\:443 ssl http2;,listen \[\:\:\]\:4443 ssl http2;,' /etc/nginx/snippets/passbolt-ssl.conf \ + && sed -i '/listen \[\:\:\]\:4443 ssl http2;/a listen 4443 ssl http2;' /etc/nginx/snippets/passbolt-ssl.conf \ && sed -i 's,__CERT_PATH__,/etc/passbolt/certs/certificate.crt;,' /etc/nginx/snippets/passbolt-ssl.conf \ && sed -i 's,__KEY_PATH__,/etc/passbolt/certs/certificate.key;,' /etc/nginx/snippets/passbolt-ssl.conf \ && sed -i '/user www-data;/d' /etc/nginx/nginx.conf \ diff --git a/env/passbolt.env b/env/passbolt.env index 2b38655..1f0ec57 100644 --- a/env/passbolt.env +++ b/env/passbolt.env @@ -1,5 +1,5 @@ # URL -APP_FULL_BASE_URL=http://passbolt.local +APP_FULL_BASE_URL=https://passbolt.local # Database settings DATASOURCES_DEFAULT_HOST=db