|
|
@@ -14,7 +14,7 @@ V_LOG="$VESTA/log"
|
|
|
V_SRC="$VESTA/src"
|
|
|
V_PKG="$V_DATA/packages"
|
|
|
V_USERS="$V_DATA/users"
|
|
|
-V_DB="$VESTA/conf"
|
|
|
+V_DB="$V_CONF"
|
|
|
V_QUEUE="$V_DATA/queue"
|
|
|
V_IPS="$V_DATA/ips"
|
|
|
V_WEBTPL="$V_DATA/templates"
|
|
|
@@ -23,14 +23,20 @@ V_LOCK=/var/lock/vesta
|
|
|
V_HOME='/home'
|
|
|
V_TMP='/tmp'
|
|
|
V_BACKUP='/backup'
|
|
|
+V_WEB="$VESTA/web"
|
|
|
+V_RRD="$V_WEB/rrd"
|
|
|
|
|
|
# Other vars
|
|
|
V_BACKUP_GZIP='5'
|
|
|
-V_SUSPEND_URL='vestacp.com/faq/acc_suspended/'
|
|
|
+V_BACKUP_DISK_LIMIT='95'
|
|
|
+V_BACKUP_LA_LIMIT='5'
|
|
|
+V_SUSPEND_URL='vestacp.com/suspended/'
|
|
|
V_SCRIPT=$(basename $0)
|
|
|
-V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $*"
|
|
|
-V_DATE=$(date +%m-%d-%y)
|
|
|
+V_EVENT="$(date "+%F %T") $V_SCRIPT $*"
|
|
|
+V_DATE=$(date +%F)
|
|
|
V_UPD_HOST=yum.vestacp.com
|
|
|
+V_RRD_STEP='300'
|
|
|
+V_RRD_IFACE_EXCLUDE='lo'
|
|
|
|
|
|
# Return codes
|
|
|
OK=0
|
|
|
@@ -72,31 +78,31 @@ E_DOM_NOTALIAS=39
|
|
|
E_IP_EXIST=40
|
|
|
E_IP_NOTEXIST=41
|
|
|
E_IP_USED=42
|
|
|
-E_IP_UNUSED=33
|
|
|
-E_IP_OWNED=34
|
|
|
-E_IP_NOTOWNED=35
|
|
|
+E_IP_UNUSED=107
|
|
|
+E_IP_OWNED=108
|
|
|
+E_IP_NOTOWNED=98
|
|
|
E_QUOTA_ENABLED=1
|
|
|
-E_QUOTA_DISABLED=6
|
|
|
-E_LOG_EXIST=36
|
|
|
-E_LOG_NOTEXIST=37
|
|
|
-E_LOG_ENABLED=38
|
|
|
-E_LOG_DISABLED=39
|
|
|
-E_PKG_EXIST=7
|
|
|
-E_PKG_NOTEXIST=7
|
|
|
-E_PKG_UPGRADE=20
|
|
|
-E_PASSWORD_SHORT=23
|
|
|
-E_PASSWORD_WRONG=24
|
|
|
-E_FWD_EXISTS=25
|
|
|
+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=30
|
|
|
-E_CONF_NOTEXIST=31
|
|
|
-E_PID_EXIST=32
|
|
|
-E_PID_NOTEXIST=32
|
|
|
-E_FILE_BROKEN=33
|
|
|
-E_LIMIT_NOTFOUND=34
|
|
|
-E_BACKUP_ENABLED=40
|
|
|
-E_BACKUP_DISABLED=41
|
|
|
-E_LOCK_EXIST=42
|
|
|
+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
|
|
|
@@ -142,4 +148,12 @@ E_DBUSER_EXIST=86
|
|
|
E_DBHOST_BUSY=87
|
|
|
E_DBHOST_FREE=88
|
|
|
E_UPD_FAILED=89
|
|
|
-E_PROXY_DISABLED='90'
|
|
|
+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
|
Serghey Rodin