List php-fpm instances individually

Author: Kristan Kenney

bin/v-list-sys-services

@@ -162,10 +162,14 @@ fi
 
 # Checking WEB Backend
 if [ ! -z "$WEB_BACKEND" ] && [ "$WEB_BACKEND" != 'remote' ]; then
-    proc_name=$(ls /usr/sbin/php*fpm* | rev | cut -d'/' -f 1 | rev)
-    get_srv_state $proc_name
-    data="$data\nNAME='$WEB_BACKEND' SYSTEM='backend server' STATE='$state'"
-    data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+    php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
+    for version in $php_versions; do
+        proc_name="php-fpm${version}"
+        service_name="php${version}-fpm"
+        get_srv_state $proc_name
+        data="$data\nNAME='$service_name' SYSTEM='backend server' STATE='$state'"
+        data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+    done
 fi
 
 # Checking WEB Proxy

bin/v-restart-service

@@ -33,9 +33,20 @@ is_format_valid 'service' 'restart'
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Get installed php versions
+php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
+
+# Substitute php-fpm service name formats
+for version in $php_versions; do
+    if [ "$service" = "php-fpm${version}" ]; then
+        service="php${version}-fpm"
+    fi
+done
+
+# Multi-instance service restart request handling
 if [ "$service" = "php-fpm" ];then
-    for php_ver in $(multiphp_versions); do
-        service_list="${service_list} php${php_ver}-fpm"
+    for version in $php_versions; do
+        service_list="${service_list} php${version}-fpm"
     done
 else
     service_list="$service"
@@ -61,6 +72,7 @@ for service in $service_list; do
             "$service" = "php7.2-fpm" -o \
             "$service" = "php7.3-fpm" -o \
             "$service" = "php7.4-fpm" -o \
+            "$service" = "php8.0-fpm" -o \
             "$service" = "proftpd" -o    \
             "$service" = "ssh" -o       \
             "$service" = "fail2ban" ]; then

web/restart/service/index.php

@@ -17,7 +17,7 @@
             exec (HESTIA_CMD."v-update-firewall", $output, $return_var);
         } else {
             $v_service = escapeshellarg($_GET['srv']);
-            exec (HESTIA_CMD."v-restart-service ".$v_service, $output, $return_var);
+            exec (HESTIA_CMD."v-restart-service ".$v_service. " yes", $output, $return_var);
         }
     }
     if ($return_var != 0) {

web/templates/admin/list_services.html

@@ -140,12 +140,17 @@
             <? } else {?>
                 <i class="fas fa-minus-circle status-icon red icon-pad-right"></i>
             <? } ?>
-            <b><a href="/edit/server/<? echo $key ?>/" title="<?=_('edit')?>: <?=$key?>"><?=$key?></a></b>
+            <? if (($key == "php5.6-fpm") || ($key == "php7.0-fpm") || ($key == "php7.1-fpm") || ($key == "php7.2-fpm") || ($key == "php7.3-fpm") || ($key == "php7.4-fpm") || ($key == "php8.0-fpm")) {
+                $edit_url="php";
+            } else {
+                $edit_url=$key;
+            }?>
+            <b><a href="/edit/server/<? echo $edit_url ?>/" title="<?=_('edit')?>: <?=$key?>"><?=$key?></a></b>
           </div>
           <div class="clearfix l-unit__stat-col--left text-center compact-2">
             <div class="actions-panel clearfix">
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href">
-                  <a href="/edit/server/<? echo $key ?>/" title="<?=_('edit')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim icon-large"></i></a>
+                  <a href="/edit/server/<? echo $edit_url ?>/" title="<?=_('edit')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim icon-large"></i></a>
               </div>
               <div class="actions-panel__col actions-panel__stop shortcut-s" key-action="js">
                   <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_servicerestart" title="<?=_('restart')?>">