github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

redesigned return codes

Browse source
This commit is contained in:
Serghey Rodin 2011-12-18 22:39:29 +02:00
commit 593819e10b
24 changed files with 335 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/v_add_sys_user
View file

@ -25,8 +25,8 @@ is_user_free() {
# Checking result
if [ ! -z "$check_sysuser" ] || [ -e "$V_USERS/$user" ]; then
echo "Error: user $user exist"
log_event 'debug' "$E_USER_EXIST $V_EVENT"
exit $E_USER_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}

16
bin/v_backup_sys_user
View file

@ -46,8 +46,8 @@ while [ "$la" -ge "$V_BACKUP_LA_LIMIT" ]; do
if [ "$i" -ge "15" ]; then
echo "Error: LA is too high"
log_event 'debug' "$E_LOAD_AVERAGE $V_EVENT"
exit $E_LOAD_AVERAGE
log_event 'debug' "$E_LA $V_EVENT"
exit $E_LA
fi
(( ++i))
@ -367,8 +367,8 @@ local_backup(){
disk_usage=$(df $V_BACKUP | awk '{print $5}'|tail -n1|cut -f 1 -d '%')
if [ "$disk_usage" -ge "$V_BACKUP_DISK_LIMIT" ]; then
echo "Error: Not enough disk space"
log_event 'debug' "$E_DISK_SPACE $V_EVENT"
exit $E_DISK_SPACE
log_event 'debug' "$E_DISK $V_EVENT"
exit $E_DISK
fi
# Creating final tarball
@ -402,8 +402,8 @@ ftp_backup(){
if [ -z "$HOST" ] || [ -z "$USERNAME" ] || [ -z "$PASSWORD" ] ||\
[ -z "$BPATH" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Debug info
@ -417,8 +417,8 @@ ftp_backup(){
rm $ftmpdir"
if [ ! -z "$(ftpc "$command")" ] ; then
echo "Error: FTP error"
log_event 'debug' "$E_FTP_ERROR $V_EVENT"
exit $E_FTP_ERROR
log_event 'debug' "$E_FTP $V_EVENT"
exit $E_FTP
fi
# Checking retention

8
bin/v_change_sys_ip_status
View file

@ -33,8 +33,8 @@ is_sys_ip_valid
current_status=$(get_sys_ip_value '$STATUS')
if [ "$ip_status" = "$current_status" ]; then
echo "Error: status is already set"
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
# Parsing current ip usage
@ -45,8 +45,8 @@ ip_owner=$(get_sys_ip_value '$OWNER')
# Checking condition
if [ "$web_domains" -ne '0' ] && [ "$sys_user" != "$ip_owner" ]; then
echo "Error: ip is used"
log_event 'debug' "$E_IP_USED $V_EVENT"
exit $E_IP_USED
log_event 'debug' "$E_INUSE $V_EVENT"
exit $E_INUSE
fi

4
bin/v_change_sys_user_package
View file

@ -47,8 +47,8 @@ is_package_avalable() {
[ "$DISK_QUOTA" -lt "$U_DISK" ] ||\
[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}

4
bin/v_del_web_domain_alias
View file

@ -49,8 +49,8 @@ get_web_domain_values
check_alias=$(echo ${ALIAS//,/ }|grep -w "$dom_alias")
if [ -z "$check_alias" ]; then
echo "Error: alias not exist"
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
exit $E_DOM_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
#----------------------------------------------------------#

4
bin/v_upd_sys_rrd_ftp
View file

@ -24,7 +24,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -89,7 +89,7 @@ rrdtool graph $V_RRD/ftp/$period-ftp.png \
#----------------------------------------------------------#
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
exit

4
bin/v_upd_sys_rrd_httpd
View file

@ -23,7 +23,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
@ -94,7 +94,7 @@ rrdtool graph $V_RRD/web/$period-httpd.png \
#----------------------------------------------------------#
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
exit

4
bin/v_upd_sys_rrd_la
View file

@ -23,7 +23,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -94,7 +94,7 @@ rrdtool graph $V_RRD/la/$period-la.png \
#----------------------------------------------------------#
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
exit

4
bin/v_upd_sys_rrd_mem
View file

@ -23,7 +23,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -94,7 +94,7 @@ rrdtool graph $V_RRD/mem/$period-mem.png \
#----------------------------------------------------------#
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
exit

8
bin/v_upd_sys_rrd_mysql
View file

@ -24,7 +24,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -76,8 +76,8 @@ for host in $hosts; do
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]
then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Parsing data
@ -126,7 +126,7 @@ for host in $hosts; do
GPRINT:s:'MAX:Max\:''%8.0lf\j' >/dev/null 2>/dev/null; result=$?
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
done

4
bin/v_upd_sys_rrd_net
View file

@ -23,7 +23,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -100,7 +100,7 @@ for iface in $ifaces; do
GPRINT:out:'MAX:Max\:''%8.0lf\j' >/dev/null 2>/dev/null; result=$?
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
done

4
bin/v_upd_sys_rrd_nginx
View file

@ -23,7 +23,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -86,7 +86,7 @@ rrdtool graph $V_RRD/web/$period-nginx.png \
#----------------------------------------------------------#
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
exit

8
bin/v_upd_sys_rrd_pgsql
View file

@ -24,7 +24,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -78,8 +78,8 @@ for host in $hosts; do
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]
then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
@ -132,7 +132,7 @@ for host in $hosts; do
GPRINT:t:'MAX:Max\:''%8.0lf\j' >/dev/null 2>/dev/null; result=$?
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
done

4
bin/v_upd_sys_rrd_ssh
View file

@ -23,7 +23,7 @@ case $period in
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
*) exit $E_RRD_FAILED ;;
*) exit $E_RRD ;;
esac
# Checking directory
@ -87,7 +87,7 @@ rrdtool graph $V_RRD/ssh/$period-ssh.png \
#----------------------------------------------------------#
if [ "$result" -ne 0 ]; then
exit $E_RRD_FAILED
exit $E_RRD
fi
exit

20
bin/v_upd_sys_user_backups
View file

@ -158,8 +158,8 @@ init_ftp_variables() {
if [ -z "$HOST" ] || [ -z "$USERNAME" ] || [ -z "$PASSWORD" ] ||\
[ -z "$BPATH" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
}
@ -171,8 +171,8 @@ check_ftp_connection(){
rm $ftmpdir"
if [ ! -z "$(ftpc "$command")" ] ; then
echo "Error: FTP error"
log_event 'debug' "$E_FTP_ERROR $V_EVENT"
exit $E_FTP_ERROR
log_event 'debug' "$E_FTP $V_EVENT"
exit $E_FTP
fi
}
@ -197,8 +197,8 @@ is_user_valid
# Checking load averages
la=$(cat /proc/loadavg |cut -f 1 -d ' '|cut -f 1 -d '.')
if [ "$la" -ge "$V_BACKUP_LA_LIMIT" ]; then
log_event 'debug' "$E_LOAD_AVERAGE $V_EVENT"
exit $E_LOAD_AVERAGE
log_event 'debug' "$E_LA $V_EVENT"
exit $E_LA
fi
@ -232,8 +232,8 @@ if [ "$type" = 'ftp' ]; then
cd $tmpdir
if [ ! -z "$(ftpc "get $backup")" ]; then
echo "Error: FTP transfer error"
log_event 'debug' "$E_FTP_ERROR $V_EVENT"
exit $E_FTP_ERROR
log_event 'debug' "$E_FTP $V_EVENT"
exit $E_FTP
fi
get_backup_info $tmpdir/$backup $type >> $tmp_file
rm -f $tmpdir/$backup
@ -259,8 +259,8 @@ if [ "$type" = 'ftp,local' ] || [ "$type" = 'local,ftp' ]; then
cd $tmpdir
if [ ! -z "$(ftpc "get $backup")" ]; then
echo "Error: FTP transfer error"
log_event 'debug' "$E_FTP_ERROR $V_EVENT"
exit $E_FTP_ERROR
log_event 'debug' "$E_FTP $V_EVENT"
exit $E_FTP
fi
get_backup_info $tmpdir/$backup ftp >> $tmp_file
rm -f $tmpdir/$backup

8
bin/v_upd_sys_vesta
View file

@ -43,8 +43,8 @@ if [ "$version" != "$VERSION" ]; then
# Checking download result
if [ "$?" -ne "0" ]; then
echo "Error: version tree update failed"
log_event 'debug' "$E_UPD_FAILED $V_EVENT"
exit $E_UPD_FAILED
log_event 'debug' "$E_UPDATE $V_EVENT"
exit $E_UPDATE
fi
# Deviding version
@ -89,8 +89,8 @@ if [ "$version" != "$VERSION" ]; then
# Checking download result
if [ "$?" -ne "0" ]; then
echo "Error: version tree update failed"
log_event 'debug' "$E_UPD_FAILED $V_EVENT"
exit $E_UPD_FAILED
log_event 'debug' "$E_UPDATE $V_EVENT"
exit $E_UPDATE
fi
bash $V_BIN/updates/$update.sh
done

4
bin/v_upd_web_domain_stat
View file

@ -53,8 +53,8 @@ stats=$(get_web_domain_value '$STATS')
config="$V_HOME/$user/conf/$stats.$domain.conf"
if [ ! -e "$config" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking statistics directory

143
conf/vars.conf
View file

@ -1,9 +1,3 @@
#############################################################
# #
# This file contains vesta global variable defenitions #
# #
#############################################################
# Paths
VESTA=/usr/local/vesta
V_BIN=$VESTA/bin
@ -39,121 +33,22 @@ V_RRD_STEP=300
V_RRD_IFACE_EXCLUDE=lo
# Return codes
OK=0
ERROR=1
E_BAD_CMD=2
E_BAD_ARGS=3
E_BAD_STATUS=4
E_BAD_TYPE=5
E_BAD_FORMAT=6
E_PARSE_ERROR=7
E_STR_NOTFOUND=8
E_OUTOFRANGE=9
E_WEB_ENABLED=10
E_WEB_DISABLED=11
E_MAIL_ENABLED=12
E_MAIL_DISABLED=13
E_DNS_ENABLED=14
E_DNS_DISABLED=15
E_DB_ENABLED=16
E_DB_DISABLED=17
E_IM_ENABLED=18
E_IM_DISABLED=19
E_USER_EXIST=20
E_USER_NOTEXIST=21
E_USER_BADSTATUS=22
E_USER_SUSPENDED=23
E_USER_UNSUSPENDED=24
E_USER_UNKNOWN=25
E_DOM_EXIST=30
E_DOM_NOTEXIST=31
E_DOM_ADDED=32
E_DOM_NOTADDED=33
E_DOM_SUSPENDED=34
E_DOM_UNSUSPENDED=35
E_DOM_OWNED=36
E_DOM_NOTOWNED=37
E_DOM_ISALIAS=38
E_DOM_NOTALIAS=39
E_IP_EXIST=40
E_IP_NOTEXIST=41
E_IP_USED=42
E_IP_UNUSED=107
E_IP_OWNED=108
E_IP_NOTOWNED=98
E_QUOTA_ENABLED=1
E_QUOTA_DISABLED=103
E_LOG_EXIST=100
E_LOG_NOTEXIST=101
E_LOG_ENABLED=102
E_LOG_DISABLED=99
E_PKG_EXIST=113
E_PKG_NOTEXIST=114
E_PKG_UPGRADE=26
E_PASSWORD_SHORT=27
E_PASSWORD_WRONG=28
E_FWD_EXISTS=46
E_FWD_NOTFOUND=29
E_CONF_EXISTS=54
E_CONF_NOTEXIST=95
E_PID_EXIST=104
E_PID_NOTEXIST=105
E_FILE_BROKEN=106
E_LIMIT_NOTFOUND=109
E_BACKUP_ENABLED=110
E_BACKUP_DISABLED=111
E_LOCK_EXIST=112
E_DIR_NOTEXIST=43
E_DIR_EXIST=44
E_EMAIL_INVALID=45
E_HOST_NOTFOUND=47
E_HOST_EXIST=48
E_HOST_USED=53
E_CONN_FAILED=49
E_PERMS_REQUEIURED=50
E_TPL_EXIST=51
E_TPL_NOTEXIST=52
E_AUTH_ENABLED=55
E_AUTH_DISABLED=56
E_STATS_ENABLED=57
E_STATS_DISABLED=58
E_CERT_EXIST=59
E_CERT_NOTEXIST=60
E_CERT_INVALID=61
E_KEY_INVALID=62
E_CERTKEY_INVALID=63
E_CERT_USED=64
E_VALUE_EMPTY=65
E_VALUE_EXIST=66
E_ALIAS_NOTEXIST=67
E_ALIAS_EXIST=68
E_SHELL_INVALID=69
E_INTERFACE_NOTEXIST=70
E_IP_FIRST=71
E_JOB_NOTEXIST=72
E_JOB_EXIST=73
E_ID_NOTEXIST=74
E_ID_EXIST=75
E_DB_NOTEXIST=76
E_DB_EXIST=77
E_DBHOST_NOTEXIST=78
E_DBHOST_EXIST=79
E_DBHOST_UNAVAILABLE=80
E_JOB_SUSPENDED=81
E_JOB_UNSUSPENDED=82
E_DB_SUSPENDED=83
E_DB_UNSUSPENDED=84
E_DBUSER_NOTEXIST=85
E_DBUSER_EXIST=86
E_DBHOST_BUSY=87
E_DBHOST_FREE=88
E_UPD_FAILED=89
E_PROXY_DISABLED=90
E_FTP_ERROR=91
E_SFTP_ERROR=92
E_DISK_SPACE=93
E_LOAD_AVERAGE=94
E_CHILD_EXIST=96
E_CHILD_NOTEXIST=97
E_RRD_FAILED=114
E_BACKUP_NOTFOUND=115
E_ARGS=1
E_INVALID=2
E_NOTEXIST=3
E_EXISTS=4
E_SUSPENDED=5
E_UNSUSPENDED=6
E_INUSE=7
E_LIMIT=8
E_PASSWORD=9
E_FORBIDEN=10
E_DISABLED=11
E_PARSING=12
E_DISK=13
E_LA=14
E_FTP=15
E_SSH=16
E_DB=17
E_RRD=18
E_UPDATE=19

20
func/cron.func
View file

@ -12,9 +12,9 @@ is_cron_job_free() {
check_job=$(grep "JOB='$job'" $V_USERS/$user/cron.conf)
if [ ! -z "$check_job" ]; then
echo "Error: job exist"
log_event 'debug' "$E_JOB_EXIST $V_EVENT"
exit $E_JOB_EXIST
echo "Error: job id exist"
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -61,9 +61,9 @@ is_job_valid() {
result=$(grep "JOB='$job'" $V_USERS/$user/cron.conf)
if [ -z "$result" ]; then
echo "Error: job not exists"
log_event 'debug' "$E_JOB_NOTEXIST $V_EVENT"
exit $E_JOB_NOTEXIST
echo "Error: job id not exists"
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -80,8 +80,8 @@ is_job_suspended() {
# Checkng key
if [ ! -z "$str" ]; then
echo "Error: job suspended"
log_event 'debug' "$E_JOB_SUSPENDED $V_EVENT"
exit $E_JOB_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -92,8 +92,8 @@ is_job_unsuspended() {
# Checkng key
if [ ! -z "$str" ]; then
echo "Error: job unsuspended"
log_event 'debug' "$E_JOB_UNSUSPENDED $V_EVENT"
exit $E_JOB_UNSUSPENDED
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
exit $E_UNSUSPENDED
fi
}

176
func/db.func
View file

@ -5,8 +5,8 @@ is_db_valid() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: db not added"
log_event 'debug' "$E_DB_NOTEXIST $V_EVENT"
exit $E_DB_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -17,8 +17,8 @@ is_db_new() {
# Checking result
if [ ! -z "$check_db" ]; then
echo "Error: db exist"
log_event 'debug' "$E_DB_EXIST $V_EVENT"
exit $E_DB_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -31,8 +31,8 @@ is_db_host_valid() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: host not added"
log_event 'debug' "$E_DBHOST_NOTEXIST $V_EVENT"
exit $E_DBHOST_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -231,16 +231,16 @@ create_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding database & checking result
@ -248,8 +248,8 @@ create_db_mysql() {
code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding user with password (% will give access to db from any ip)
@ -279,16 +279,16 @@ create_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding new role
@ -296,8 +296,8 @@ create_db_pgsql() {
code=$?
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding database & checking result
@ -320,8 +320,8 @@ is_db_host_new() {
check_host=$(grep "HOST='$host'" $V_DB/$type.conf)
if [ ! -z "$check_host" ]; then
echo "Error: db host exist"
log_event 'debug' "$E_DBHOST_EXIST $V_EVENT"
exit $E_DBHOST_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
fi
}
@ -332,8 +332,8 @@ is_mysql_host_alive() {
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
}
@ -344,8 +344,8 @@ is_pgsql_host_alive() {
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
}
@ -356,8 +356,8 @@ is_db_suspended() {
# Checking result
if [ ! -z "$check_db" ]; then
echo "Error: db suspended"
log_event 'debug' "$E_DB_SUSPENDED $V_EVENT"
exit $E_DB_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -368,8 +368,8 @@ is_db_unsuspended() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: db unsuspended"
log_event 'debug' "$E_DB_UNSUSPENDED $V_EVENT"
exit $E_DB_UNSUSPENDED
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
exit $E_UNSUSPENDED
fi
}
@ -380,8 +380,8 @@ is_db_user_valid() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: dbuser not exist"
log_event 'debug' "$E_DBUSER_NOTEXIST $V_EVENT"
exit $E_DBUSER_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -396,16 +396,16 @@ change_db_mysql_password() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Changing user password
@ -430,16 +430,16 @@ change_db_pgsql_password() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
$sql "ALTER ROLE $db_user WITH LOGIN PASSWORD '$db_password'" >/dev/null
@ -474,24 +474,24 @@ del_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting database & checking result
$sql "DROP DATABASE $database" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting user
@ -523,16 +523,16 @@ del_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting database & checking result
@ -540,8 +540,8 @@ del_db_pgsql() {
$sql "DROP DATABASE $database" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting user
@ -562,8 +562,8 @@ del_db_vesta() {
string=$( grep -n "DB='$database'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
@ -580,16 +580,16 @@ dump_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Dumping database
@ -613,16 +613,16 @@ dump_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Dumping database
@ -649,8 +649,8 @@ is_db_host_free() {
# Checking U_DB_BASES
if [ 0 -ne "$U_DB_BASES" ]; then
echo "Error: host is used"
log_event 'debug' "$E_DBHOST_BUSY $V_EVENT"
exit $E_DBHOST_BUSY
log_event 'debug' "$E_INUSE $V_EVENT"
exit $E_INUSE
fi
}
@ -661,8 +661,8 @@ del_dbhost_vesta() {
string=$( grep -n "HOST='$host'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
@ -709,16 +709,16 @@ suspend_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Suspending user
@ -739,16 +739,16 @@ suspend_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Suspending user
@ -767,16 +767,16 @@ unsuspend_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Unsuspending user
@ -797,16 +797,16 @@ unsuspend_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Unsuspending user
@ -840,16 +840,16 @@ get_disk_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting database & checking result
@ -885,16 +885,16 @@ get_disk_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Raw query

104
func/domain.func
View file

@ -19,10 +19,10 @@ is_domain_new() {
if [ ! -z "$check_domain" ] || [ ! -z "$check_alias" ]; then
if [ "$output_mode" != 'quiet' ]; then
echo "Error: domain exist"
log_event 'debug' "$E_DOM_EXIST $V_EVENT"
exit $E_DOM_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
return $E_DOM_EXIST
return $E_EXISTS
fi
}
@ -43,8 +43,8 @@ is_domain_owner() {
# Checking result
if [ -z "$check_domain" ] && [ -z "$check_alias" ]; then
echo "Error: domain not owned"
log_event 'debug' "$E_DOM_NOTOWNED $V_EVENT"
exit $E_DOM_NOTOWNED
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
}
@ -55,8 +55,8 @@ is_dns_domain_free() {
# Checking result
if [ ! -z "$check_domain" ]; then
echo "Error: domain exist"
log_event 'debug' "$E_DOM_EXIST $V_EVENT"
exit $E_DOM_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -75,8 +75,8 @@ is_web_domain_free() {
# Checking result
if [ ! -z "$check_domain" ] || [ ! -z "$check_alias" ]; then
echo "Error: domain exist"
log_event 'debug' "$E_DOM_EXIST $V_EVENT"
exit $E_DOM_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -87,8 +87,8 @@ is_dns_domain_valid() {
# Checking result
if [ -z "$check_domain" ]; then
echo "Error: domain not exist"
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
exit $E_DOM_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -99,8 +99,8 @@ is_web_domain_valid() {
# Checking result
if [ -z "$check_domain" ]; then
echo "Error: domain not exist"
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
exit $E_DOM_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -113,8 +113,8 @@ is_domain_suspended() {
# Checking result
if [ ! -z "$check_domain" ]; then
echo "Error: domain suspended"
log_event 'debug' "$E_DOM_SUSPENDED $V_EVENT"
exit $E_DOM_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -127,8 +127,8 @@ is_domain_unsuspended() {
# Checking result
if [ ! -z "$check_domain" ]; then
echo "Error: domain unsuspended"
log_event 'debug' "$E_DOM_UNSUSPENDED $V_EVENT"
exit $E_DOM_UNSUSPENDED
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
exit $E_UNSUSPENDED
fi
}
@ -207,8 +207,8 @@ is_dns_record_free() {
if [ ! -z "$check_id" ]; then
echo "Error: ID exist"
log_event 'debug' "$E_ID_EXIST $V_EVENT"
exit $E_ID_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -254,8 +254,8 @@ get_web_config_brds() {
# Defining template borders
serv_line=$(grep -ni 'Name %domain_idn%' "$tpl_file" |cut -f 1 -d :)
if [ -z "$serv_line" ]; then
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
return $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
return $E_PARSING
fi
# Template lines
@ -444,8 +444,8 @@ is_web_domain_key_empty() {
# Checkng key
if [ ! -z "$value" ] && [ "$value" != 'no' ]; then
echo "Error: value is not empty = $value"
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -453,34 +453,34 @@ is_web_domain_cert_valid() {
# Checking file existance
if [ ! -e "$ssl_dir/$domain.crt" ] || [ ! -e "$ssl_dir/$domain.key" ]; then
echo "Error: certificate not exist"
log_event 'debug' "$E_CERT_NOTEXIST $V_EVENT"
exit $E_CERT_NOTEXIST
echo "Error: ssl certificate not exist"
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
# Checking certificate
crt=$(openssl verify $ssl_dir/$domain.crt 2>/dev/null |grep '/C=')
if [ -z "$crt" ]; then
echo "Error: certificate invalid"
log_event 'debug' "$E_CERT_INVALID $V_EVENT"
exit $E_CERT_INVALID
echo "Error: ssl certificate invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking certificate key
openssl rsa -in "$ssl_dir/$domain.key" -check >/dev/null 2>/dev/null
if [ "$?" -ne 0 ]; then
echo "Error: key invalid"
log_event 'debug' "$E_KEY_INVALID $V_EVENT"
exit $E_KEY_INVALID
echo "Error: ssl key invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking certificate authority
if [ -e "$ssl_dir/$domain.ca" ]; then
ca=$(openssl verify $ssl_dir/$domain.ca 2>/dev/null |grep '/C=')
if [ -z "$ca" ]; then
echo "Error: certificate invalid"
log_event 'debug' "$E_CERT_INVALID $V_EVENT"
exit $E_CERT_INVALID
echo "Error: ssl certificate invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
fi
@ -493,9 +493,9 @@ is_web_domain_cert_valid() {
kill $pid > /dev/null 2>&1
result=$?
if [ "$result" -ne '0' ]; then
echo "Error: certificate key pair invalid"
log_event 'debug' "$E_CERTKEY_INVALID $V_EVENT"
exit $E_CERTKEY_INVALID
echo "Error: ssl certificate key pair invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -506,8 +506,8 @@ is_dns_record_valid() {
if [ -z "$check_id" ]; then
echo "Error: ID not exist"
log_event 'debug' "$E_ID_NOTEXIST $V_EVENT"
exit $E_ID_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -528,8 +528,8 @@ is_web_domain_value_exist() {
# Checking result
if [ -z "$value" ] || [ "$value" = 'no' ]; then
echo "Error: ${key//$/} is empty"
log_event 'debug' "$E_VALUE_EMPTY $V_EVENT"
exit $E_VALUE_EMPTY
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -550,8 +550,8 @@ is_dns_domain_value_exist() {
# Checking result
if [ -z "$value" ] || [ "$value" = 'no' ]; then
echo "Error: ${key//$/} is empty"
log_event 'debug' "$E_VALUE_EMPTY $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_EXISTS
fi
}
@ -571,8 +571,8 @@ del_dns_domain() {
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
rm -f $V_USERS/$user/dns/$domain
@ -585,8 +585,8 @@ del_web_domain() {
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
@ -678,8 +678,8 @@ namehost_ip_disable() {
if [ -z "$tpl_ln" ] || [ -z "$ip_line" ] || [ -z "$conf_line" ]
then
echo "Error: nginx config paring error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
up_line=$((ip_line - 1))
@ -689,8 +689,8 @@ namehost_ip_disable() {
# Checking parsed lines
if [ -z "$first_line" ] || [ -z "$last_line" ]; then
echo "Error: nginx config paring error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$first_line,$last_line d" $nconf

42
func/ip.func
View file

@ -6,8 +6,8 @@ is_sys_ip_free() {
ip_check=$(echo "$ip_list"|grep -w "$ip")
if [ -n "$ip_check" ] || [ -e "$V_IPS/$ip" ]; then
echo "Error: IP exist"
log_event 'debug' "$E_IP_EXIST $V_EVENT"
exit $E_IP_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -32,8 +32,8 @@ is_sys_ip_valid() {
# Checking ip existance
if [ ! -e "$V_IPS/$ip" ] || [ -z "$check_ifc" ]; then
echo "Error: IP not exist"
log_event 'debug' "$E_IP_NOTEXIST $V_EVENT"
exit $E_IP_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -54,8 +54,8 @@ is_ip_key_empty() {
# Checkng key
if [ ! -z "$value" ] && [ "$value" != '0' ]; then
echo "Error: value is not empty = $value "
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -92,8 +92,8 @@ is_ip_avalable() {
# Checking ip existance
if [ ! -e "$V_IPS/$ip" ]; then
echo "Error: IP not exist"
log_event 'debug' "$E_IP_NOTEXIST $V_EVENT"
exit $E_IP_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
# Parsing ip data
@ -110,8 +110,8 @@ is_ip_avalable() {
if [ "$ip_owner" != "$user" ] && [ "$ip_shared" != 'yes' ]; then
echo "Error: ip not owned by user"
log_event 'debug' "$E_IP_NOTOWNED $V_EVENT"
exit $E_IP_NOTOWNED
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
}
@ -121,8 +121,8 @@ is_sys_ip_owner() {
ip_owner=$(grep 'OWNER=' $V_IPS/$ip|cut -f 2 -d \')
if [ "$ip_owner" != "$user" ]; then
echo "Error: IP not owned"
log_event 'debug' "$E_IP_NOTOWNED $V_EVENT"
exit $E_IP_NOTOWNED
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
}
@ -144,8 +144,8 @@ increase_ip_value() {
# Checking result
if [ -z "$current_web" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# +1 webdomain
@ -181,8 +181,8 @@ decrease_ip_value() {
# Checking result
if [ -z "$current_web" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# -1 webdomain
@ -230,16 +230,16 @@ get_current_interface() {
# Checking result
if [ -z "$i" ]; then
echo "Error: IP not exist"
log_event 'debug' "$E_IP_NOTEXIST $V_EVENT"
exit $E_IP_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
# Checking ip is alias
check_alias=$(echo $i| cut -s -f 2 -d :)
if [ -z "$check_alias" ]; then
echo "Error: IP is first on interface"
log_event 'debug' "$E_IP_FIRST $V_EVENT"
exit $E_IP_FIRST
echo "Error: Main IP on interface"
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
echo "$i"
}

170
func/shared.func
View file

@ -35,8 +35,8 @@ check_args() {
if [ "$user_args" -lt "$sys_args" ]; then
echo "Error: bad args"
echo "Usage: $V_SCRIPT $usage"
log_event 'debug' "$E_BAD_ARGS $V_EVENT"
exit $E_BAD_ARGS
log_event 'debug' "$E_ARGS $V_EVENT"
exit $E_ARGS
fi
}
@ -51,9 +51,9 @@ format_validation() {
check_http=$( echo "$val" |grep "^https://" )
needed_chars=$(echo "$val" | cut -s -f 2 -d '.')
if [ -z "$check_http" ] || [ -z "$needed_chars" ]; then
echo "Error: shell not found"
log_event 'debug' "$E_SHELL_INVALID $V_EVENT"
exit $E_SHELL_INVALID
echo "Error: invalid url"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -65,8 +65,8 @@ format_validation() {
check_shell=$(/usr/bin/chsh --list-shells | grep -w "$val" )
if [ -z "$check_shell" ]; then
echo "Error: shell not found"
log_event 'debug' "$E_SHELL_INVALID $V_EVENT"
exit $E_SHELL_INVALID
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -77,8 +77,8 @@ format_validation() {
# Checking password lenght
if [ "${#val}" -lt '6' ]; then
echo "Error: password is shorter than 6 chars"
log_event 'debug' "$E_PASSWORD_SHORT $V_EVENT"
exit $E_PASSWORD_SHORT
log_event 'debug' "$E_PASSWORD $V_EVENT"
exit $E_PASSWORD
fi
}
@ -92,23 +92,23 @@ format_validation() {
if [[ 0 -ne "$special_chars" ]]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking letters
letters=$(echo "$val" | grep -c "[a-Z]")
if [ 0 -ne "$letters" ]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking -zero
if [[ 0 -ne "$val" ]] && [[ 0 -gt "$val" ]]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -125,8 +125,8 @@ format_validation() {
if [ -z "$oc1" ] || [ -z "$oc2" ] || [ -z "$oc3" ] || [ -z "$oc4" ]
then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -139,8 +139,8 @@ format_validation() {
# Checking status
if [ -z "$check_status" ]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -157,8 +157,8 @@ format_validation() {
[ "${#check_dt}" -lt 2 ] &&\
[ "$val" != 'vesta@localhost' ]; then
echo "Error: email format is wrong"
log_event 'debug' "$E_EMAIL_INVALID $V_EVENT"
exit $E_EMAIL_INVALID
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -172,8 +172,8 @@ format_validation() {
if [ "$return_val" -ne 0 ]; then
echo "Error: intreface not exist"
log_event 'debug' "$E_INTERFACE_NOTEXIST"
exit $E_INTERFACE_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -188,8 +188,8 @@ format_validation() {
# Checking result
if [[ 0 -ne "$special_chars" ]]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -205,8 +205,8 @@ format_validation() {
# Checking result
if [[ 0 -ne "$special_chars" ]] || [ -z "$needed_chars" ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -221,8 +221,8 @@ format_validation() {
# Checking result
if [[ 0 -ne "$special_chars" ]] || [ 17 -le ${#val} ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -233,8 +233,8 @@ format_validation() {
# Checking result
if [ 17 -le ${#val} ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -260,8 +260,8 @@ format_validation() {
if [[ "$known" != 'yes' ]]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -272,8 +272,8 @@ format_validation() {
# Checking result
if [ 200 -le ${#val} ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -286,8 +286,8 @@ format_validation() {
check_rtype="$(echo "A AAAA NS CNAME" | grep -i -w "$rtype")"
if [ ! -z "$check_spaces" ] && [ ! -z "$check_rtype" ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking ip
@ -362,48 +362,48 @@ is_system_enabled() {
web_function() {
if [ -z "$WEB_SYSTEM" ] || [ "$WEB_SYSTEM" = "no" ]; then
echo "Error: web hosting support disabled"
log_event 'debug' "$E_WEB_DISABLED $V_EVENT"
exit $E_WEB_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
proxy_function() {
if [ "$PROXY_SYSTEM" != 'nginx' ]; then # only nginx
echo "Error: proxy hosting support disabled" # support for
log_event 'debug' "$E_PROXY_DISABLED $V_EVENT" # now
exit $E_PROXY_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT" # now
exit $E_DISABLED
fi
}
dns_function() {
if [ -z "$DNS_SYSTEM" ] || [ "$DNS_SYSTEM" = "no" ]; then
echo "Error: dns support disabled"
log_event 'debug' "$E_DNS_DISABLED $V_EVENT"
exit $E_DNS_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
cron_function() {
if [ -z "$CRON_SYSTEM" ] || [ "$CRON_SYSTEM" = "no" ]; then
echo "Error: crond support disabled"
log_event 'debug' "$E_CRON_DISABLED $V_EVENT"
exit $E_CRON_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
db_function() {
if [ -z "$DB_SYSTEM" ] || [ "$DB_SYSTEM" = "no" ]; then
echo "Error: db support disabled"
log_event 'debug' "$E_DB_DISABLED $V_EVENT"
exit $E_DB_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
backup_function() {
if [ -z "$BACKUP_SYSTEM" ] || [ "$BACKUP_SYSTEM" = "no" ]; then
echo "Error: backup support disabled"
log_event 'debug' "$E_BACKUP_DISABLED $V_EVENT"
exit $E_BACKUP_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
@ -424,14 +424,14 @@ is_user_valid() {
check_user=$(grep -w "$search_user" /etc/passwd )
if [ -z "$check_user" ]; then
echo "Error: user not found"
log_event 'debug' "$E_USER_NOTEXIST $V_EVENT"
exit $E_USER_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
if [ ! -d "$V_USERS/$search_user" ]; then
echo "Error: unknown user"
log_event 'debug' "$E_USER_UNKNOWN $V_EVENT"
exit $E_USER_UNKNOWN
log_event 'debug' "$E_USER_NOTEXIST $V_EVENT"
exit $E_USER_NOTEXIST
fi
}
@ -440,8 +440,8 @@ is_user_suspended() {
check_suspend=$(grep "SUSPENDED='yes'" $V_USERS/$user/user.conf)
if [ ! -z "$check_suspend" ]; then
echo "Error: User is suspended"
log_event 'debug' "$E_USER_SUSPENDED $V_EVENT"
exit $E_USER_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -457,8 +457,8 @@ is_package_full() {
val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' )
if [ "$domain_number" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -472,8 +472,8 @@ is_package_full() {
val=$(grep 'WEB_ALIASES=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$alias_nmb" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -482,8 +482,8 @@ is_package_full() {
val=$(grep '^WEB_SSL=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$val" -eq '0' ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
# Checking domains
@ -491,8 +491,8 @@ is_package_full() {
# Comparing current val with conf
if [ "$domain_nmb" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -504,8 +504,8 @@ is_package_full() {
val=$(grep '^DNS_DOMAINS=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$domain_number" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -517,8 +517,8 @@ is_package_full() {
val=$(grep '^DATABASES=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$db_number" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -536,8 +536,8 @@ is_package_full() {
mail_forwarder) mail_forwarder "$user" "$domain";;
*)
echo "Error: bad type"
log_event 'debug' "$E_BAD_TYPE $V_EVENT"
exit $E_BAD_TYPE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
;;
esac
}
@ -555,8 +555,8 @@ is_template_valid() {
if [ -z "$check_tpl" ] || [ ! -e $tpl ] || \
[ ! -e $descr ] || [ ! -e $ssl ]; then
echo "Error: template not found"
log_event 'debug' "$E_TPL_NOTEXIST"
exit $E_TPL_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -567,8 +567,8 @@ is_template_valid() {
if [ ! -e $tpl ] || [ ! -e $descr ] || [ ! -e $ssl ]; then
echo "Error: template not found"
log_event 'debug' "$E_TPL_NOTEXIST"
exit $E_TPL_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -578,8 +578,8 @@ is_template_valid() {
if [ ! -e $tpl ] || [ ! -e $descr ]; then
echo "Error: template not found"
log_event 'debug' "$E_TPL_NOTEXIST"
exit $E_TPL_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -630,8 +630,8 @@ restart_schedule() {
is_package_valid() {
if [ ! -e "$V_PKG/$package.pkg" ]; then
echo "Error: package is not exist"
log_event 'debug' "$E_PKG_NOTEXIST $v_log"
exit $E_PKG_NOTEXIST
log_event 'debug' "$E_NOTEXIST $v_log"
exit $E_NOTEXIST
fi
}
@ -680,8 +680,8 @@ increase_user_value() {
# Checking result
if [ -z "$current_value" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Plus one
@ -709,8 +709,8 @@ is_type_valid() {
# Checking result
if [ -z "$check_type" ]; then
echo "Error: unknown type"
log_event 'debug' "$E_BAD_TYPE $V_EVENT"
exit $E_BAD_TYPE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -728,8 +728,8 @@ decrease_user_value() {
# Checking result
if [ -z "$current_value" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking zero val
@ -875,8 +875,8 @@ is_backup_enabled() {
BACKUPS=$(grep "BACKUPS='" $V_USERS/$user/user.conf |cut -f 2 -d \')
if [ -z "$BACKUPS" ] || [[ "$BACKUPS" -le '0' ]]; then
echo "Error: User backups are disabled"
log_event 'debug' "$E_BACKUP_DISABLED $V_EVENT"
exit $E_BACKUP_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}

8
src/v_check_sys_user_password.c
View file

@ -28,7 +28,7 @@ int main (int argc, char** argv) {
if (3 > argc) {
printf("Error: bad args\n",argv[0]);
printf("Usage: %s user password [ip]\n",argv[0]);
exit(3);
exit(1);
};
// checking ip
@ -47,7 +47,7 @@ int main (int argc, char** argv) {
FILE* pFile = fopen ("/usr/local/vesta/log/auth.log","a+");
if (NULL == pFile) {
printf("Error: can not open file %s \n", argv[0]);
exit(7);
exit(12);
}
// parsing user argument
@ -74,12 +74,12 @@ int main (int argc, char** argv) {
strcat(str, " failed to login \n");
fputs (str,pFile); // writing
fclose (pFile); // closing
exit(24); // exiting
exit(9); // exiting
};
}
} else {
printf("Error: no such user\n",argv[1]);
exit(21);
exit(3);
};
return EXIT_SUCCESS;