Release 7.7.1 - See CHANGELOG.md

Author: tiredofit

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.7.1 2023-11-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Remove `BOTH` Option for PHP_FPM_LISTEN_TYPE
+
+
 ## 7.7.0 2023-11-25 <dave at tiredofit dot ca>
 
    ### Added

README.md

@@ -194,12 +194,12 @@ When `PHP_FPM_CONTAINER_MODE` set to `nginx` the `PHP_FPM_LISTEN_PORT` environme
 | `PHP_APC_SHM_SIZE`                    | APC Cache Memory size - `0` to disable                                                                   | `128M`                                      |
 | `PHP_APC_TTL`                         | APC Time to live in seconds                                                                              | `7200`                                      |
 | `PHP_FPM_HOST`                        | PHP-FPM Host, dependenent on PHP_FPM_LISTEN_TYPE, add multiple with commas                               | `127.0.0.1:9000` or `/var/run/php-fpm.sock` |
-| `PHP_FPM_LISTEN_TYPE`                 | PHP-FPM listen type `UNIX` sockets or `TCP` sockets or `BOTH`                                            | `unix`                                      |
+| `PHP_FPM_LISTEN_TYPE`                 | PHP-FPM listen type `UNIX` sockets or `TCP` sockets                                                      | `unix`                                      |
 | `PHP_FPM_LISTEN_TCP_IP`               | PHP-FPM Listening IP if `PHP_LISTEN_TYPE=TCP`                                                            | `0.0.0.0`                                   |
 | `PHP_FPM_LISTEN_TCP_IP_ALLOWED`       | PHP-FPM allow only these hosts if `PHP_LISTEN_TYPE=TCP`                                                  | `127.0.0.1`                                 |
 | `PHP_FPM_LISTEN_TCP_PORT`             | PHP-FPM Listening Port - Ignored with above container options                                            | `9000`                                      |
 | `PHP_FPM_LISTEN_UNIX_SOCKET`          | PHP-FPM Listen Socket if `PHP_LISTEN_TYPE=UNIX`                                                          | `/var/run/php-fpm.sock`                     |
-| `PHP_FPM_LISTEN_UNIX_SOCKET_USER`     | PHP-FPM Listen Socket user `PHP_LISTEN_TYPE=UNIX`                                                        | `${NGINX_USER}` or `${UNIT_USER}`          |
+| `PHP_FPM_LISTEN_UNIX_SOCKET_USER`     | PHP-FPM Listen Socket user `PHP_LISTEN_TYPE=UNIX`                                                        | `${NGINX_USER}` or `${UNIT_USER}`           |
 | `PHP_FPM_LISTEN_UNIX_SOCKET_GROUP`    | PHP-FPM Listen Socket group `PHP_LISTEN_TYPE=UNIX`                                                       | `${NGINX_GROUP}` or `${UNIT_GROUP}`         |
 | `PHP_FPM_MAX_CHILDREN`                | Maximum Children                                                                                         | `75`                                        |
 | `PHP_FPM_MAX_REQUESTS`                | How many requests before spawning new server                                                             | `500`                                       |
@@ -210,7 +210,7 @@ When `PHP_FPM_CONTAINER_MODE` set to `nginx` the `PHP_FPM_LISTEN_PORT` environme
 | `PHP_FPM_POST_INIT_SCRIPT`            | If you wish to execute a script before php-fpm executes, enter it here and seperate multiples by comma.  |                                             |
 | `PHP_FPM_PROCESS_MANAGER`             | How to handle processes `static`, `ondemand`, `dynamic`                                                  | `dynamic`                                   |
 | `PHP_FPM_START_SERVERS`               | How many FPM servers to start initially                                                                  | `2`                                         |
-| `PHP_FPM_USER`                        | User to run PHP-FPM master process as                                                                    | `${NGINX_USER}` or `${UNIT_USER}`                            |
+| `PHP_FPM_USER`                        | User to run PHP-FPM master process as                                                                    | `${NGINX_USER}` or `${UNIT_USER}`           |
 | `PHP_HIDE_X_POWERED_BY`               | Hide X-Powered by response                                                                               | `TRUE`                                      |
 | `PHP_LOG_ACCESS_FILE`                 | PHP Access Logfile Name                                                                                  | `access.log`                                |
 | `PHP_LOG_ERROR_FILE`                  | Logfile name                                                                                             | `error.log`                                 |

install/assets/defaults/20-php-fpm

@@ -10,7 +10,7 @@ PHP_ENABLE_CREATE_SAMPLE_PHP=${PHP_ENABLE_CREATE_SAMPLE_PHP:-"TRUE"}
 PHP_HIDE_X_POWERED_BY=${PHP_HIDE_X_POWERED_BY:-"TRUE"}
 PHP_KITCHENSINK=${PHP_KITCHENSINK:-"FALSE"}
 PHP_FPM_LISTEN_IP=${PHP_FPM_LISTEN_IP:-"0.0.0.0"}
-PHP_FPM_LISTEN_TYPE=${PHP_FPM_LISTEN_TYPE:-"both"}
+PHP_FPM_LISTEN_TYPE=${PHP_FPM_LISTEN_TYPE:-"unix"}
 PHP_FPM_LISTEN_PORT=${PHP_FPM_LISTEN_PORT:-"9000"}
 PHP_FPM_LISTEN_TCP_IP=${PHP_FPM_LISTEN_TCP_IP:-"${PHP_FPM_LISTEN_IP}"}
 PHP_FPM_LISTEN_TCP_IP_ALLOWED=${PHP_FPM_LISTEN_TCP_IP_ALLOWED:-"127.0.0.1"}
@@ -82,9 +82,6 @@ fi
 
 if [ -z "${PHP_FPM_HOST}" ]; then
     case "${PHP_FPM_LISTEN_TYPE,,}" in
-        both )
-            PHP_FPM_HOST=${PHP_FPM_LISTEN_UNIX_SOCKET}
-        ;;
         tcp )
             PHP_FPM_HOST=127.0.0.1:${PHP_FPM_LISTEN_TCP_PORT}
         ;;

install/assets/functions/20-php-fpm

@@ -203,9 +203,6 @@ phpfpm_configure_server() {
     truefalse_onoff PHP_DISPLAY_ERRORS
 
     case "${PHP_FPM_LISTEN_TYPE,,}" in
-        "both" )
-            create_socket_dir
-        ;;
         "tcp" )
             sed -i \
                         -e "/listen = {{PHP_FPM_LISTEN_UNIX_SOCKET}}/d" \