Merge changes from upstream

This commit is contained in:
ZonD Eighty 2013-01-16 14:12:53 +04:00
commit c094d8582d
54 changed files with 4981 additions and 5671 deletions

View file

@ -1,8 +1,8 @@
#!/bin/bash
# info: restart dns service
# info: restart web services
# options: NONE
#
# The function tells BIND service to reload dns zone files.
# The function reloads web server configuration.
#----------------------------------------------------------#
@ -12,41 +12,37 @@
# Includes
source $VESTA/conf/vesta.conf
source $VESTA/func/main.sh
EVENT=${1-$EVENT}
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
if [ "$WEB_SYSTEM" = 'apache' ]; then
/etc/init.d/httpd status &>/dev/null
/etc/init.d/httpd status >/dev/null 2>&1
if [ $? -eq 0 ]; then
/etc/init.d/httpd graceful &>/dev/null
/etc/init.d/httpd graceful >/dev/null 2>&1
if [ $? -ne 0 ]; then
log_event "$E_RESTART" "$EVENT"
exit $E_RESTART
fi
else
/etc/init.d/httpd start &>/dev/null
/etc/init.d/httpd start >/dev/null 2>&1
if [ $? -ne 0 ]; then
log_event "$E_RESTART" "$EVENT"
exit $E_RESTART
fi
fi
fi
if [ "$PROXY_SYSTEM" = 'nginx' ]; then
/etc/init.d/nginx status &>/dev/null
/etc/init.d/nginx status >/dev/null 2>&1
if [ $? -eq 0 ]; then
/etc/init.d/nginx reload &>/dev/null
/etc/init.d/nginx reload >/dev/null 2>&1
if [ $? -ne 0 ]; then
log_event "$E_RESTART" "$EVENT"
exit $E_RESTART
fi
else
/etc/init.d/nginx start &>/dev/null
/etc/init.d/nginx start >/dev/null 2>&1
if [ $? -ne 0 ]; then
log_event "$E_RESTART" "$EVENT"
exit $E_RESTART
fi
fi