Skip to content

Commit dfea3e5

Browse files
committed
Merge branch 'master' of https://github.com/serghey-rodin/vesta
# Conflicts: # web/inc/i18n/fa.php
2 parents 46302f6 + d205253 commit dfea3e5

File tree

5 files changed

+1028
-300
lines changed

5 files changed

+1028
-300
lines changed

bin/v-restart-web-backend

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ if [ -z "$WEB_BACKEND" ] || [ "$WEB_BACKEND" = 'remote' ]; then
5050
fi
5151

5252
# Restart system
53-
service $WEB_BACKEND restart >/dev/null 2>&1
53+
php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d /)
54+
if [ -z "$php_fpm" ]; then
55+
service $WEB_BACKEND restart >/dev/null 2>&1
56+
else
57+
service $php_fpm restart >/dev/null 2>&1
58+
fi
59+
5460
if [ $? -ne 0 ]; then
5561
send_email_report
5662
check_result $E_RESTART "$WEB_BACKEND restart failed"

bin/v-update-web-domain-ssl

100644100755
File mode changed.

web/css/styles.min.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3123,13 +3123,14 @@ form#vstobjects.suspended {
31233123
background: rgba(50, 50, 50, 0.9);
31243124
display: inline-block;
31253125
position: fixed;
3126-
right: 20%;
3126+
left: 50%;
31273127
bottom: 0;
31283128
color: #eee;
31293129
width: 800px;
31303130
border: 1px solid #333;
31313131
font-size: 13px;
31323132
z-index: 120;
3133+
transform: translate(-50%, 0);
31333134
}
31343135
.shortcuts .header {
31353136
border-bottom: 1px solid #333;

0 commit comments

Comments
 (0)