Просмотр исходного кода

Fix editing Panel Cronjobs for hestiaweb (#4891)

sahsanu 1 год назад
Родитель
Сommit
1dd8bf613e
2 измененных файлов с 12 добавлено и 9 удалено
  1. 11 8
      bin/v-change-sys-service-config
  2. 1 1
      web/edit/server/hestiaweb/index.php

+ 11 - 8
bin/v-change-sys-service-config

@@ -109,14 +109,17 @@ if [ "$update" = 'yes' ] && [ "$restart" != 'no' ]; then
 		fi
 	fi
 
-	$BIN/v-restart-service "$service" > /dev/null 2>&1
-
-	if [ $? -ne 0 ]; then
-		for config in $dst; do
-			cat "$config.vst.back" > "$config"
-			rm -f "$config.vst.back"
-		done
-		check_result "$E_RESTART" "ERROR: $service failed to start with new configuration."
+	if [[ "$service" != "hestiaweb" ]]; then
+		$BIN/v-restart-service "$service" > /dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			for config in $dst; do
+				cat "$config.vst.back" > "$config"
+				rm -f "$config.vst.back"
+			done
+			check_result "$E_RESTART" "ERROR: $service failed to start with new configuration."
+		fi
+	else
+		rm -f "$config.vst.back"
 	fi
 fi
 

+ 1 - 1
web/edit/server/hestiaweb/index.php

@@ -20,7 +20,7 @@ if (!empty($_POST["save"])) {
 		fwrite($fp, str_replace("\r\n", "\n", $_POST["v_config"]));
 		fclose($fp);
 		exec(
-			HESTIA_CMD . "v-change-sys-service-config " . $new_conf . " hestiaweb no",
+			HESTIA_CMD . "v-change-sys-service-config " . $new_conf . " hestiaweb yes",
 			$output,
 			$return_var,
 		);