From 9ad8abd2e279eb2852e52d70a53c6f9d254f26f8 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Thu, 11 Nov 2021 16:52:13 +0100 Subject: [PATCH] [fix] Residual php conf --- scripts/upgrade | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6844d1a..d193da8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,6 +58,7 @@ if [ -d /var/www/wifiadmin/ ]; then ynh_secure_remove /var/www/wifiadmin/ fi + if [ $firmware_nonfree = "yes" ]; then firmware_nonfree=1 ynh_app_setting_set --app=$app --key=firmware_nonfree --value=$firmware_nonfree @@ -84,10 +85,10 @@ if [ -f /etc/nginx/conf.d/*.d/$app.conf ]; then ynh_secure_remove /etc/nginx/conf.d/*.d/$app.conf ynh_systemd_action --service_name=nginx --action=reload fi -if [ -f /etc/php/*/fpm/pool.d/$app.conf ]; then - ynh_secure_remove /etc/php/*/fpm/pool.d/$app.conf - ynh_systemd_action --service_name=php$YNH_DEFAULT_PHP_VERSION-fpm --action=reload -fi + +for php_path in $(ls /etc/php/*/fpm/pool.d/$app.conf 2> /dev/null); do + ynh_secure_remove $php_path +done if [ -d /var/www/$app ]; then ynh_secure_remove /var/www/$app