Skip to content

Commit 58dd294

Browse files
authored
Rename web backend to php interpreter (hestiacp#3825)
Command line script names and variable names have not been changed at this time.
1 parent 7702ea5 commit 58dd294

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

bin/v-add-web-domain-backend

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ fi
8686
# Hestia #
8787
#----------------------------------------------------------#
8888

89-
# Restart backend server
89+
# Restart php interpreter
9090
$BIN/v-restart-web-backend "$restart" "$backend_version"
91-
check_result $? "Web backend restart failed" > /dev/null
91+
check_result $? "PHP restart failed" > /dev/null
9292

9393
# Logging
9494
$BIN/v-log-action "$user" "Info" "Web" "Web domain configuration applied (Domain: $domain, Backend: $WEB_BACKEND)."

bin/v-change-web-domain-backend-tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ if [ "$version" != "$backend_version" ]; then
177177
$BIN/v-restart-web-backend "$restart" "$backend_version"
178178
fi
179179

180-
check_result $? "Web backend restart failed" > /dev/null
180+
check_result $? "PHP restart failed" > /dev/null
181181

182182
# Logging
183183
$BIN/v-log-action "$user" "Info" "Web" "Backend template applied (Domain: $domain, Template: $template)."

bin/v-delete-web-domain

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,16 @@ else
145145
version=$(multiphp_default_version)
146146
fi
147147
# Restarting web server
148-
$BIN/v-restart-web "$restart"
148+
$BIN/v-restart-web "$restart"
149149
check_result $? "Web restart failed" > /dev/null
150150

151151
# Restarting proxy server
152152
$BIN/v-restart-proxy "$restart"
153153
check_result $? "Proxy restart failed" > /dev/null
154154

155-
# Restarting backend server
155+
# Restarting php interpreter
156156
$BIN/v-restart-web-backend "$restart" "$version"
157-
check_result $? "Backend restart failed" > /dev/null
157+
check_result $? "PHP restart failed" > /dev/null
158158

159159
# Logging
160160
$BIN/v-log-action "$user" "Info" "Web" "Deleted web domain (Name: $domain)."

bin/v-delete-web-domain-backend

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ if [[ $BACKEND =~ ^.*PHP-([0-9])\_([0-9])$ ]]; then
8484
else
8585
version=$(multiphp_default_version)
8686
fi
87-
# Restarting backend server
87+
# Restarting php interpreter
8888
$BIN/v-restart-web-backend "$restart" "$version"
89-
check_result $? "Backend restart failed" > /dev/null
89+
check_result $? "PHP restart failed" > /dev/null
9090

9191
# Logging
9292
$BIN/v-log-action "$user" "Info" "Web" "Web domain configuration deleted (Domain: $domain)."

bin/v-list-sys-config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ shell_list() {
124124
echo "SSL Support: $WEB_SSL:$WEB_SSL_PORT"
125125
fi
126126
if [ -n "$WEB_BACKEND" ]; then
127-
echo "Web Backend: $WEB_BACKEND"
127+
echo "PHP Intepreter: $WEB_BACKEND"
128128
fi
129129
if [ -n "$PROXY_SYSTEM" ]; then
130130
echo "Proxy Server: $PROXY_SYSTEM:$PROXY_PORT"

bin/v-list-sys-services

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ if [ -n "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'remote' ]; then
162162
data="$data MEM='$mem' RTIME='$rtime'"
163163
fi
164164

165-
# Checking WEB Backend
165+
# Checking PHP intepreter
166166
if [ -n "$WEB_BACKEND" ] && [ "$WEB_BACKEND" != 'remote' ]; then
167167
php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
168168
for version in $php_versions; do
169169
proc_name="php-fpm${version}"
170170
service_name="php${version}-fpm"
171171
get_srv_state "$proc_name"
172-
data="$data\nNAME='$service_name' SYSTEM='backend server' STATE='$state'"
172+
data="$data\nNAME='$service_name' SYSTEM='php interpreter' STATE='$state'"
173173
data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
174174
done
175175
fi

bin/v-restart-web-backend

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
2-
# info: restart backend server
2+
# info: restart php interpreter
33
# options: NONE
44
#
55
# example: v-restart-web-backend
66
#
7-
# This function reloads backend server configuration.
7+
# This function reloads php interpreter configuration.
88

99
restart=$1
1010
# For backward compatibility might change in the feature

web/locale/hestiacp.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4194,7 +4194,7 @@ msgid "Proxy Server"
41944194
msgstr ""
41954195

41964196
#: ../../web/templates/pages/edit_server.php:241
4197-
msgid "Backend Server"
4197+
msgid "PHP Interpreter"
41984198
msgstr ""
41994199

42004200
#: ../../web/templates/pages/edit_server.php:252
@@ -4735,7 +4735,7 @@ msgid "web server"
47354735
msgstr ""
47364736

47374737
#: ../../bin/v-list-sys-services:172
4738-
msgid "backend server"
4738+
msgid "php interpreter"
47394739
msgstr ""
47404740

47414741
#: ../../bin/v-list-sys-services:180

web/templates/pages/edit_server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class="form-check-input"
238238
<?php } ?>
239239
<?php if (!empty($_SESSION["WEB_BACKEND"])) { ?>
240240
<p>
241-
<?= _("Backend Server") ?>:
241+
<?= _("PHP Interpreter") ?>:
242242
<span class="u-ml5">
243243
<?= $_SESSION["WEB_BACKEND"] ?>
244244
</span>

0 commit comments

Comments
 (0)