Merge branch 'release/v0.5.1' into master

CHANGELOG.md

@@ -3,7 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased](https://github.com/passbolt/passbolt_install_scripts/compare/v0.4.0...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_install_scripts/compare/v0.5.1...HEAD)
+
+## [0.5.1](https://github.com/passbolt/passbolt_install_scripts/compare/v0.5.1..v0.5.0) - 2020-09-25
+
+### Fixed
+- php-fpm incorrect group name for socket communications configuration
 
 ## [0.5.0](https://github.com/passbolt/passbolt_install_scripts/compare/v0.5.0..v0.4.0) - 2020-04-20
 

conf/centos/constants.sh

@@ -4,6 +4,7 @@ readonly OS_VERSION_FILE="/etc/centos-release"
 readonly FPM_WWW_POOL="/etc/php-fpm.d/www.conf"
 readonly FPM_SERVICE="php-fpm"
 readonly WWW_USER="nginx"
+readonly WWW_GROUP="nginx"
 readonly WWW_USER_HOME="/var/lib/nginx"
 readonly GNUPG_HOME='/var/lib/nginx/.gnupg'
 readonly CRONTAB_DIR='/var/spool/cron/'

conf/debian/constants.sh

@@ -4,6 +4,7 @@ readonly OS_VERSION_FILE="/etc/debian_version"
 readonly FPM_WWW_POOL="/etc/php/7.3/fpm/pool.d/www.conf"
 readonly FPM_SERVICE="php7.3-fpm"
 readonly WWW_USER="www-data"
+readonly WWW_GROUP="www-data"
 readonly WWW_USER_HOME="/home/www-data"
 readonly GNUPG_HOME='/home/www-data/.gnupg'
 readonly CRONTAB_DIR='/var/spool/cron/crontabs'

conf/redhat/constants.sh

@@ -4,6 +4,7 @@ readonly OS_VERSION_FILE="/etc/redhat-release"
 readonly FPM_WWW_POOL="/etc/opt/rh/rh-php73/php-fpm.d/www.conf"
 readonly FPM_SERVICE="rh-php73-php-fpm"
 readonly WWW_USER="nginx"
+readonly WWW_GROUP="nginx"
 readonly WWW_USER_HOME="/var/opt/rh/rh-nginx116/lib/nginx"
 readonly GNUPG_HOME='/var/lib/nginx/.gnupg'
 readonly CRONTAB_DIR='/var/spool/cron/'

conf/ubuntu/constants.sh

@@ -4,6 +4,7 @@ readonly OS_VERSION_FILE='/etc/debian_version'
 readonly FPM_WWW_POOL="/etc/php/7.2/fpm/pool.d/www.conf"
 readonly FPM_SERVICE="php7.2-fpm"
 readonly WWW_USER="www-data"
+readonly WWW_GROUP="www-data"
 readonly WWW_USER_HOME="/home/www-data"
 readonly GNUPG_HOME='/home/www-data/.gnupg'
 readonly CRONTAB_DIR='/var/spool/cron/crontabs'

lib/helpers/setup_fpm.sh

@@ -6,6 +6,7 @@ setup_fpm(){
 
   cp "$script_directory/conf/php/www.conf" "$FPM_WWW_POOL"
   sed -i s:_WWW_USER_:"$WWW_USER": "$FPM_WWW_POOL"
+  sed -i s:_WWW_GROUP_:"$WWW_GROUP": "$FPM_WWW_POOL"
 
   enable_service "$FPM_SERVICE"
 }