Release 7.6.9 - See CHANGELOG.md

tiredofit · Jun 21, 2023 · a37aebb · a37aebb
1 parent 5d0da4f
commit a37aebb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.6.9 2023-06-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix case introduced with 7.6.8 where authentication takes over default settings
+
+
 ## 7.6.8 2023-06-20 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/install/assets/functions/20-php-fpm b/install/assets/functions/20-php-fpm
@@ -43,9 +43,10 @@ phpfpm_configure_authentication() {
     cp -R /etc/nginx/snippets/php-fpm.conf /etc/nginx/snippets/monitoring-php-fpm.conf
     sed -i "s|include /etc/nginx/snippets/php-fpm.conf;|include /etc/nginx/snippets/monitoring-php-fpm.conf;|g" /etc/nginx/snippets/monitoring.conf
     cat <<EOF >> /etc/nginx/snippets/php-fpm.conf
-  ### LLNG Authentication handler
-  include /etc/nginx/snippets/authentication/llng_auth_request;
-  include /etc/nginx/snippets/authentication/llng_params;
+
+### LLNG Authentication handler
+include /etc/nginx/snippets/authentication/llng_auth_request;
+include /etc/nginx/snippets/authentication/llng_params;
 EOF
 
     if [ "${NGINX_SITE_ENABLED}" = "default" ] ; then

diff --git a/install/etc/cont-init.d/20-php-fpm b/install/etc/cont-init.d/20-php-fpm
@@ -31,7 +31,7 @@ case "${PHP_FPM_CONTAINER_MODE,,}" in
             print_warn "Setting Container to operate in PHP-FPM standalone mode - You will need a seperate container for Nginx or another webserver to serve content"
             service_stop 10-nginx
             print_notice "Setting PHP-FPM to serve from ${PHP_WEBROOT}"
-            sed -i -e "/[www]#/achdir = ${PHP_WEBROOT}" /assets/php-fpm/fpm/php-fpm.conf
+            sed -i "/[www]#/achdir = ${PHP_WEBROOT}" /assets/php-fpm/fpm/php-fpm.conf
             rm -rf /etc/zabbix/zabbix_agent.conf.d/nginx.conf
       ;;
 esac
@@ -43,9 +43,8 @@ if [ ! -f "/tmp/.container/container-restart" ] ; then
     if [[ "${PHP_FPM_CONTAINER_MODE,,}" == *"nginx"* ]] ; then phpfpm_configure_nginx ; fi
     if [[ "${PHP_FPM_CONTAINER_MODE,,}" == *"php-fpm"* ]] ; then phpfpm_create_default_page ; fi
     if var_true "${NGINX_ENABLE_APPLICATION_CONFIGURATION}"; then phpfpm_configure_site_default ; fi
-    phpfpm_configure_authentication
+    if [ "${NGINX_AUTHENTICATION_TYPE,,}" = "LLNG" ] ; then  phpfpm_configure_authentication ; fi
     phpfpm_configure_logging
-
     phpfpm_post_init
 fi