Jaap Marcus 4 лет назад
Родитель
Сommit
155c11e834
2 измененных файлов с 6 добавлено и 4 удалено
  1. 1 0
      CHANGELOG.md
  2. 5 4
      bin/v-delete-web-php

+ 1 - 0
CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## [Development] 
 
 - Allow custom mail domains with own certificates #2061 @myrevery 
+- Fixed #2082 v-delete-web-php creates always new config file
 
 ## [1.4.11] - Service release 
 

+ 5 - 4
bin/v-delete-web-php

@@ -93,12 +93,13 @@ fi
 [[ -d /etc/php/$version ]] && rm -rf "/etc/php/$version"
 
 if [ "$WEB_BACKEND" = "php-fpm" ]; then
-    # Check if www.conf is still missing
-    if [ ! -f "/etc/php/*/fpm/pool.d/www.conf" ]; then
+    conf=$(find /etc/php* -name www.conf)
+    # Check if www.conf exists
+    if [ -z  "$conf" ]; then
         # If not grab the "last php version
-        last=$($HESTIA/bin/v-list-sys-php "shell" | tail -n1);
+        last=$($BIN/v-list-sys-php "shell" | tail -n1);
         cp -f $HESTIA/install/deb/php-fpm/www.conf /etc/php/$last/fpm/pool.d/www.conf
-        $HESTIA/bin/v-restart-web-backend
+        $BIN/v-restart-web-backend
     fi
 fi