From f1bad02f0dec3c9a67ec7dcbdbe84dd82242fd75 Mon Sep 17 00:00:00 2001 From: KuhnChris Date: Fri, 5 May 2023 00:46:58 +0200 Subject: [PATCH 1/2] Add 3 new env parameters for port selecting --- dev/bin/docker-entrypoint.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dev/bin/docker-entrypoint.sh b/dev/bin/docker-entrypoint.sh index e6ade75..e09aa7f 100755 --- a/dev/bin/docker-entrypoint.sh +++ b/dev/bin/docker-entrypoint.sh @@ -137,4 +137,23 @@ fi install +## replace nginx config +PASSBOLT_WWW_PORT="${PASSBOLT_WWW_PORT:-80}" +PASSBOLT_WWW_SSL_PORT="${PASSBOLT_WWW_SSL_PORT:-443}" +NGINX_SOURCEFILE=/etc/nginx/conf.d/default.conf +sed -i 's/listen[ \t]*80[^0-9]*$/listen 80; #www/g' "$NGINX_SOURCEFILE" +sed -i 's/listen[ \t]*443[^0-9]*$/listen 443; #ssl/g' "$NGINX_SOURCEFILE" +sed -i 's/listen.*#www$/listen '"$PASSBOLT_WWW_PORT"'; #www/g' "$NGINX_SOURCEFILE" +sed -i 's/listen.*#ssl$/listen '"$PASSBOLT_WWW_SSL_PORT"'; #ssl/g' "$NGINX_SOURCEFILE" +echo "ready - changed port from 80 to $PASSBOLT_WWW_PORT" +echo "ready - changed port from 443 to $PASSBOLT_WWW_SSL_PORT" + +## replace php-fpm config +PASSBOLT_PHP_FPM_PORT="${PASSBOLT_PHP_FPM_PORT:-9000}" +PHPFPM_SOURCEFILE=/usr/local/etc/php-fpm.d/ +for i in ${PHPFPM_SOURCEFILE}/*; do sed -i 's/listen .*$/listen = 127.0.0.1:'"$PASSBOLT_PHP_FPM_PORT"'/g' "$i"; done +sed -i 's/fastcgi_pass.*$/fastcgi_pass 127.0.0.1:'"$PASSBOLT_PHP_FPM_PORT"';/g' "$NGINX_SOURCEFILE" +echo "ready - changed php-fpm port from 9000 to $PASSBOLT_WWW_PORT" +## // + exec /usr/bin/supervisord -n From 1fb582bb92bf5463f3cd182ed8b3969d18475e52 Mon Sep 17 00:00:00 2001 From: KuhnChris Date: Fri, 5 May 2023 00:57:54 +0200 Subject: [PATCH 2/2] Added new parameters to README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5b54cb6..0df19fe 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,9 @@ Passbolt docker image provides several environment variables to configure differ | PASSBOLT_REGISTRATION_PUBLIC | Defines if users can register | false | PASSBOLT_SSL_FORCE | Redirects http to https | true | PASSBOLT_SECURITY_SET_HEADERS | Send CSP Headers | true +| PASSBOLT_WWW_PORT | Nginx HTTP port | 80 +| PASSBOLT_WWW_SSL_PORT | Nginx HTTPS port | 443 +| PASSBOLT_PHP_FPM_PORT | PHP-FPM port | 9000 | SECURITY_SALT | CakePHP security salt | __SALT__ For more env variables supported please check [default.php](https://github.com/passbolt/passbolt_api/blob/master/config/default.php)