Skip to content

Commit 595ce38

Browse files
ScIT-RaphaelScIT-Raphael
authored
Merge pull request hestiacp#1471 from hestiacp/fix/2020-12-multi-php-errors
[Bug] Remove "backup" from multi-php option
2 parents 971b344 + a214159 commit 595ce38

12 files changed

Lines changed: 28 additions & 138 deletions

File tree

‎bin/v-add-web-domain‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ source $USER_DATA/user.conf
7171
# Creating domain directories
7272
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain"
7373
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_html"
74-
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_shtml"
7574
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/document_errors"
7675
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/cgi-bin"
7776
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/private"
@@ -100,7 +99,7 @@ chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
10099
chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*
101100
chown $user:www-data $HOMEDIR/$user/web/$domain/public_*html
102101

103-
# Addding PHP-FPM backend
102+
# Adding PHP-FPM backend
104103
if [ ! -z "$WEB_BACKEND" ]; then
105104
if [ -z "$BACKEND_TEMPLATE" ]; then
106105
BACKEND_TEMPLATE='default'

‎bin/v-change-web-domain-sslhome‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ case $SSL_HOME in
6464
*) check_args '3' "2" 'USER DOMAIN SSLHOME'
6565
esac
6666

67+
if [ "$SSL_HOME" = 'single' ] && [ ! -d $HOMEDIR/$user/web/$domain/public_shtml ]; then
68+
mkdir $HOMEDIR/$user/web/$domain/public_shtml
69+
chown $user:$user $HOMEDIR/$user/web/$domain/public_shtml
70+
user_exec cp $WEBTPL/skel/public_html/* "$HOMEDIR/$user/web/$domain/public_shtml" >/dev/null 2>&1
71+
for file in $(find "$HOMEDIR/$user/web/$domain/public_shtml" -type f); do
72+
sed -i "s/%domain%/$domain/g" $file
73+
done
74+
fi
75+
6776
# Changing sslhome directory
6877
replace_web_config "$WEB_SYSTEM" "$TPL.stpl"
6978

@@ -80,12 +89,8 @@ fi
8089
# Update config
8190
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
8291

83-
# Restarting web server
84-
$BIN/v-restart-web $restart
85-
check_result $? "Web restart failed" >/dev/null
86-
87-
$BIN/v-restart-proxy $restart
88-
check_result $? "Proxy restart failed" >/dev/null
92+
# Rebuild web
93+
$BIN/v-rebuild-web-domain $user $domain
8994

9095
# Logging
9196
log_history "changed ssl home for $domain to $ssl_home"

‎func/domain.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ prepare_web_domain_values() {
160160
sdocroot="$docroot"
161161
if [ "$SSL_HOME" = 'single' ]; then
162162
sdocroot="$HOMEDIR/$user/web/$domain/public_shtml"
163+
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_shtml";
164+
chmod 751 $HOMEDIR/$user/web/$domain/public_shtml;
165+
chown www-data:$user $HOMEDIR/$user/web/$domain/public_shtml;
163166
fi
164167

165168
if [ ! -z "$WEB_BACKEND" ]; then

‎func/rebuild.sh‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ rebuild_web_domain_conf() {
216216

217217
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain"
218218
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_html"
219-
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_shtml"
220219
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/document_errors"
221220
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/cgi-bin"
222221
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/private"
@@ -248,8 +247,7 @@ rebuild_web_domain_conf() {
248247
$HOMEDIR/$user/web/$domain \
249248
$HOMEDIR/$user/web/$domain/private \
250249
$HOMEDIR/$user/web/$domain/cgi-bin \
251-
$HOMEDIR/$user/web/$domain/public_html \
252-
$HOMEDIR/$user/web/$domain/public_shtml
250+
$HOMEDIR/$user/web/$domain/public_*html
253251
chown -R $user:$user $HOMEDIR/$user/web/$domain/document_errors
254252
chown root:$user /var/log/$WEB_SYSTEM/domains/$domain.*
255253

@@ -409,15 +407,12 @@ rebuild_web_domain_conf() {
409407
$HOMEDIR/$user/web/$domain/logs
410408
chmod 751 $HOMEDIR/$user/web/$domain/private \
411409
$HOMEDIR/$user/web/$domain/cgi-bin \
412-
$HOMEDIR/$user/web/$domain/public_html \
413-
$HOMEDIR/$user/web/$domain/public_shtml \
410+
$HOMEDIR/$user/web/$domain/public_*html \
414411
$HOMEDIR/$user/web/$domain/document_errors
415412
chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
416413

417-
chown $user:www-data $HOMEDIR/$user/web/$domain/public_html \
418-
$HOMEDIR/$user/web/$domain/public_shtml
414+
chown $user:www-data $HOMEDIR/$user/web/$domain/public_*html
419415
}
420-
421416
# DNS domain rebuild
422417
rebuild_dns_domain_conf() {
423418

‎install/deb/templates/web/skel/public_shtml/index.html‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎install/deb/templates/web/skel/public_shtml/robots.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎install/hst-install-debian.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,6 @@ fi
12451245

12461246
if [ "$multiphp" = 'yes' ] ; then
12471247
for v in "${multiphp_v[@]}"; do
1248-
cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
12491248
rm -f /etc/php/$v/fpm/pool.d/*
12501249
echo "[ * ] Install PHP version $v..."
12511250
$HESTIA/bin/v-add-web-php "$v" > /dev/null 2>&1

‎install/hst-install-ubuntu.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,6 @@ fi
12991299

13001300
if [ "$multiphp" = 'yes' ] ; then
13011301
for v in "${multiphp_v[@]}"; do
1302-
cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
13031302
rm -f /etc/php/$v/fpm/pool.d/*
13041303
echo "[ * ] Install PHP version $v..."
13051304
$HESTIA/bin/v-add-web-php "$v" > /dev/null 2>&1

‎src/deb/nginx/nginx.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ http {
8484
ssl_ciphers "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS";
8585
ssl_dhparam /etc/ssl/dhparam.pem;
8686
ssl_ecdh_curve secp384r1;
87+
ssl_reject_handshake on;
8788
ssl_session_tickets off;
8889
resolver 1.0.0.1 1.1.1.1 valid=300s ipv6=off;
8990
resolver_timeout 5s;

‎web/add/user/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
// Flush field values on success
106106
if (empty($_SESSION['error_msg'])) {
107107
$_SESSION['ok_msg'] = sprintf(_('USER_CREATED_OK'),htmlentities($_POST['v_username']),htmlentities($_POST['v_username']));
108-
$_SESSION['ok_msg'] .= " / <a href=/login/?loginas=".htmlentities($_POST['v_username']).">" . _('login as') ." ".htmlentities($_POST['v_username']). "</a>";
108+
$_SESSION['ok_msg'] .= " / <a href=/login/?loginas=".htmlentities($_POST['v_username'])."&token=".htmlentities($_SESSION['token']).">" . _('login as') ." ".htmlentities($_POST['v_username']). "</a>";
109109
unset($v_username);
110110
unset($v_password);
111111
unset($v_email);

0 commit comments

Comments
 (0)