Merge changes from upstream

I'm a little angry
This commit is contained in:
ZonD Eighty 2012-12-28 23:31:02 +04:00
commit 2b16d9bd83
254 changed files with 24485 additions and 24094 deletions

View file

@ -1,39 +1,39 @@
#!/bin/bash
# info: restart cron service
# options: none
#
# The function tells crond service to reread its configuration files.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Includes
source $VESTA/conf/vesta.conf
source $VESTA/func/main.sh
EVENT=${1-$EVENT}
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Parsing config / or just source config
if [ "$CRON_SYSTEM" = 'crond' ]; then
/etc/init.d/crond 'reload' &>/dev/null
if [ $? -ne 0 ]; then
/etc/init.d/crond 'restart' &>/dev/null
if [ $? -ne 0 ]; then
log_event "$E_RESTART" "$EVENT"
exit $E_RESTART
fi
fi
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
exit
#!/bin/bash
# info: restart cron service
# options: NONE
#
# The function tells crond service to reread its configuration files.
#----------------------------------------------------------#
# Variable&Function #
#----------------------------------------------------------#
# Includes
source $VESTA/conf/vesta.conf
source $VESTA/func/main.sh
EVENT=${1-$EVENT}
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
# Parsing config / or just source config
if [ "$CRON_SYSTEM" = 'crond' ]; then
/etc/init.d/crond 'reload' &>/dev/null
if [ $? -ne 0 ]; then
/etc/init.d/crond 'restart' &>/dev/null
if [ $? -ne 0 ]; then
log_event "$E_RESTART" "$EVENT"
exit $E_RESTART
fi
fi
fi
#----------------------------------------------------------#
# Vesta #
#----------------------------------------------------------#
exit