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

29
bin/v-restart-web
View File

@@ -28,7 +28,11 @@ send_email_report() {
if [ "$WEB_SYSTEM" = "apache2" ]; then
apache2ctl configtest >> "$tmpfile" 2>&1
else
service $WEB_SYSTEM configtest >> "$tmpfile" 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$WEB_SYSTEM" "$tmpfile"
else
service $WEB_SYSTEM configtest >> "$tmpfile" 2>&1
fi
fi
if [ "$1" == "DO_RESTART" ]; then
service "$WEB_SYSTEM" restart >> "$tmpfile" 2>&1
@@ -74,9 +78,17 @@ if [ $WEB_SYSTEM = 'nginx' ]; then
fi
if [ "$DEBUG_MODE" = "true" ]; then
echo "[ $date | $WEB_SYSTEM | WEB ]" >> /var/log/hestia/debug.log 2>&1
service $WEB_SYSTEM configtest >> /var/log/hestia/debug.log 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$WEB_SYSTEM"
else
service $WEB_SYSTEM configtest >> /var/log/hestia/debug.log 2>&1
fi
else
service $WEB_SYSTEM configtest > /dev/null 2>&1
if [ -f /etc/redhat-release ]; then
$BIN/v-check-service-config "$WEB_SYSTEM" /dev/null
else
service $WEB_SYSTEM configtest > /dev/null 2>&1
fi
fi
if [ $? -ne 0 ]; then
send_email_report
@@ -93,6 +105,17 @@ elif [ $WEB_SYSTEM = 'apache2' ]; then
send_email_report
check_result "$E_RESTART" "$WEB_SYSTEM restart failed"
fi
elif [ $WEB_SYSTEM = 'httpd' ]; then
if [ "$DEBUG_MODE" = "true" ]; then
echo "[ $date | $WEB_SYSTEM | WEB ]" >> /var/log/hestia/debug.log 2>&1
$BIN/v-check-service-config "$WEB_SYSTEM" /var/log/hestia/debug.log
else
$BIN/v-check-service-config "$WEB_SYSTEM" /dev/null
fi
if [ $? -ne 0 ]; then
send_email_report
check_result "$E_RESTART" "$WEB_SYSTEM restart failed"
fi
fi
$BIN/v-restart-service "$WEB_SYSTEM" "$restart"