Fix start and stop services script for php-fpm (both single and multiphp) and add input validation

Author: Lupul

bin/v-restart-service

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: restart service
-# options: service
+# options: service [RESTART]
 #
 # The function restarts system service.
 
@@ -22,7 +22,7 @@ PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin"
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '1' "$#" 'SERVICE'
+check_args '1' "$#" 'SERVICE [RESTART]'
 is_format_valid 'service' 'restart'
 
 #----------------------------------------------------------#
@@ -72,6 +72,11 @@ for service in $service_list; do
     fi
 done
 
+
+#----------------------------------------------------------#
+#                       Hestia                             #
+#----------------------------------------------------------#
+
 # Logging
 log_event "$OK" "$ARGUMENTS"
 

bin/v-start-service

@@ -21,23 +21,36 @@ source $HESTIA/func/main.sh
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'SERVICE'
+is_format_valid 'service'
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
-if [ "$service" != 'iptables' ]; then
-    systemctl start $service > /dev/null 2>&1
-    check_result $? "ERROR: $service start failed" $E_RESTART
+if [ "$service" = "php-fpm" ];then
+    for php_ver in $(multiphp_versions); do
+        service_list="${service_list} php${php_ver}-fpm"
+    done
 else
-    $BIN/v-update-firewall
-    check_result $? "ERROR: $service start failed" $E_RESTART
+    service_list="$service"
 fi
 
+for service in $service_list; do
+    if [ "$service" = "iptables" ]; then
+        $BIN/v-update-firewall
+    else
+        systemctl start $service > /dev/null 2>&1
+    fi
+    check_result $? "ERROR: $service start failed" $E_RESTART
+done
+
 
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
+# Logging
+log_event "$OK" "$ARGUMENTS"
+
 exit

bin/v-stop-service

@@ -21,6 +21,7 @@ source $HESTIA/func/main.sh
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'SERVICE'
+is_format_valid 'service'
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
@@ -30,17 +31,29 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-if [ "$service" != 'iptables' ]; then
-    systemctl stop $service >/dev/null 2>&1
-    check_result $? "ERROR: $service stop failed" $E_RESTART
+if [ "$service" = "php-fpm" ];then
+    for php_ver in $(multiphp_versions); do
+        service_list="${service_list} php${php_ver}-fpm"
+    done
 else
-    $BIN/v-stop-firewall
-    check_result $? "ERROR: $service stop failed" $E_RESTART
+    service_list="$service"
 fi
 
+for service in $service_list; do
+    if [ "$service" = "iptables" ]; then
+        $BIN/v-stop-firewall
+    else
+        systemctl stop $service >/dev/null 2>&1
+    fi
+    check_result $? "ERROR: $service stop failed" $E_RESTART
+done
+
 
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
+# Logging
+log_event "$OK" "$ARGUMENTS"
+
 exit