bayrepo/hestiacp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fixes for hestiacp for rpm installer

Browse Source
This commit is contained in:
Alexey Berezhok
2024-05-01 19:37:06 +03:00
parent d7ea7da070
commit d221337bbd
6 changed files with 108 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bin/v-restart-proxy
View File

@@ -70,13 +70,20 @@ if [ -f "$HESTIA/web/inc/nginx_proxy" ]; then
if [ "$1" = 'background' ]; then
# Restart system
sleep 15
# Preform a check if Nginx is valid as reload doesn't throw an error / exit
if [ "$DEBUG_MODE" = "true" ]; then
echo "[ $date | $PROXY_SYSTEM ]" >> /var/log/hestia/debug.log 2>&1
service $PROXY_SYSTEM configtest >> /var/log/hestia/debug.log 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$PROXY_SYSTEM" /var/log/hestia/debug.log
else
service $PROXY_SYSTEM configtest >> /var/log/hestia/debug.log 2>&1
fi
else
service $PROXY_SYSTEM configtest > /dev/null 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$PROXY_SYSTEM" /dev/null
else
service $PROXY_SYSTEM configtest > /dev/null 2>&1
fi
fi
if [ $? -ne 0 ]; then
send_email_report
@@ -100,9 +107,17 @@ else
# Preform a check if Nginx is valid as reload doesn't throw an error / exit
if [ "$DEBUG_MODE" = "true" ]; then
echo "[ $date | $PROXY_SYSTEM ]" >> /var/log/hestia/debug.log 2>&1
service $PROXY_SYSTEM configtest >> /var/log/hestia/debug.log 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$PROXY_SYSTEM" /var/log/hestia/debug.log
else
service $PROXY_SYSTEM configtest >> /var/log/hestia/debug.log 2>&1
fi
else
service $PROXY_SYSTEM configtest > /dev/null 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$PROXY_SYSTEM" /dev/null
else
service $PROXY_SYSTEM configtest > /dev/null 2>&1
fi
fi
if [ $? -ne 0 ]; then
send_email_report