diff --git a/bin/v-add-backup-ftp-host b/bin/v-add-backup-ftp-host index eb3ed29e..88f5ebcc 100755 --- a/bin/v-add-backup-ftp-host +++ b/bin/v-add-backup-ftp-host @@ -50,8 +50,8 @@ validate_format 'host' 'ftp_user' 'ftp_password' # Checking network connection if [ ! -z "$(ftpc)" ]; then echo "Error: can't login to ftp" - log_event "$E_FTP" "$EVENT" - exit $E_FTP + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi # Checking write permissions diff --git a/bin/v-backup-user b/bin/v-backup-user index de011a95..afd1a32b 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -529,7 +529,7 @@ ftp_backup() { if [ ! -e "$VESTA/conf/ftp.backup.conf" ]; then ftp_conf_error="Can't open $VESTA/conf/ftp.backup.conf" echo "$ftp_conf_error" | $send_mail -s "$subj" $email - echo "Error: $VESTA/conf/ftp.backup.conf does not exist" + echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST @@ -565,8 +565,8 @@ ftp_backup() { $send_mail -s "$subj" $email echo "Error: can't login to ftp ftp://$USERNAME@$HOST" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe - log_event "$E_FTP" "$EVENT" - exit $E_FTP + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi # Check ftp permissions diff --git a/bin/v-change-sys-language b/bin/v-change-sys-language index 5512a6a2..f0be8ce8 100755 --- a/bin/v-change-sys-language +++ b/bin/v-change-sys-language @@ -19,7 +19,7 @@ source $VESTA/func/main.sh is_language_valid() { if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then - echo "Error: language $language not exist" + echo "Error: language file $language doesn't exist" log_event "$E_NOTEXIST $EVENT" exit $E_NOTEXIST fi diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index e6904654..0fdce45e 100755 --- a/bin/v-delete-mail-account-alias +++ b/bin/v-delete-mail-account-alias @@ -38,7 +38,7 @@ is_object_valid "mail/$domain" 'ACCOUNT' "$account" is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account" aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS') if [ -z "$(echo $aliases | grep -w $malias)" ]; then - echo "Error: alias $malias is not exist" + echo "Error: alias $malias doesn't exist" log_event "$E_NOTEXIST $EVENT" exit $E_NOTEXIST fi diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index 007adb13..912fe73f 100755 --- a/bin/v-delete-mail-account-forward +++ b/bin/v-delete-mail-account-forward @@ -38,7 +38,7 @@ is_object_valid "mail/$domain" 'ACCOUNT' "$account" is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account" fwd=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD') if [ -z "$(echo $fwd | grep -w $forward)" ]; then - echo "Error: forward $forward is not exist" + echo "Error: forward $forward doesn't exist" log_event "$E_NOTEXIST $EVENT" exit $E_NOTEXIST fi diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index c67c5aec..5d60c0f7 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -39,7 +39,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain" get_domain_values 'web' ip=$(get_real_ip $IP) if [ -z "$(echo $ALIAS | tr ',' '\n' | grep ^$dom_alias$)" ]; then - echo "Error: alias $dom_alias not exist" + echo "Error: alias $dom_alias doesn't exist" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi diff --git a/bin/v-restore-user b/bin/v-restore-user index 11450415..f05f362a 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -36,7 +36,7 @@ source $VESTA/func/rebuild.sh # Check backup function is_backup_valid() { if [ ! -e "$BACKUP/$backup" ]; then - echo "Error: backup not exist" + echo "Error: backup doesn't exist" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi diff --git a/func/db.sh b/func/db.sh index e515d498..17026e3f 100644 --- a/func/db.sh +++ b/func/db.sh @@ -98,8 +98,8 @@ add_mysql_database() { mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi @@ -134,8 +134,8 @@ add_pgsql_database() { psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="CREATE ROLE $dbuser WITH LOGIN PASSWORD '$dbpass'" @@ -177,8 +177,8 @@ is_mysql_host_alive() { mysql -h $host -u $dbuser -p$dbpass -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection to $host failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi } @@ -188,8 +188,8 @@ is_pgsql_host_alive() { psql -h $host -U $dbuser -c "SELECT VERSION()" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection to $host failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi } @@ -213,8 +213,8 @@ change_mysql_password() { mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\` @@ -245,8 +245,8 @@ change_pgsql_password() { psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="ALTER ROLE $DBUSER WITH LOGIN PASSWORD '$dbpass'" @@ -270,8 +270,8 @@ delete_mysql_database() { mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi query="DROP DATABASE \`$database\`" @@ -307,8 +307,8 @@ delete_pgsql_database() { psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="REVOKE ALL PRIVILEGES ON DATABASE $database FROM $DBUSER" @@ -344,8 +344,8 @@ dump_mysql_database() { echo "Can't connect to mysql server $HOST" |\ $send_mail -s "$subj" $email echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi mysqldump -h $HOST -u $USER -p$PASSWORD -r $dump $database @@ -388,8 +388,8 @@ dump_pgsql_database() { echo "Can't connect to pgsql server $HOST" |\ $send_mail -s "$subj" $email echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi pg_dump -h $HOST -U $USER -c --inserts -O -x -i -f $dump $database \ @@ -436,8 +436,8 @@ suspend_mysql_database() { mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`" @@ -462,8 +462,8 @@ suspend_pgsql_database() { psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="REVOKE ALL PRIVILEGES ON $database FROM $DBUSER" @@ -484,8 +484,8 @@ unsuspend_mysql_database() { mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi query="GRANT ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`" @@ -510,8 +510,8 @@ unsuspend_pgsql_database() { psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="GRANT ALL PRIVILEGES ON DATABASE $database TO $DBUSER" @@ -532,8 +532,8 @@ get_mysql_disk_usage() { mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi query="SELECT SUM( data_length + index_length ) / 1024 / 1024 \"Size\" @@ -561,8 +561,8 @@ get_pgsql_disk_usage() { psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 if [ '0' -ne "$?" ]; then echo "Error: Connection failed" - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="SELECT pg_database_size('$database');" diff --git a/func/main.sh b/func/main.sh index fcaa553d..7940241a 100644 --- a/func/main.sh +++ b/func/main.sh @@ -43,8 +43,8 @@ E_DISABLED=11 E_PARSING=12 E_DISK=13 E_LA=14 -E_FTP=15 -E_SSH=16 +E_CONNECT=15 +E_FTP=16 E_DB=17 E_RRD=18 E_UPDATE=19 @@ -133,7 +133,7 @@ is_package_valid() { pkg_dir="$VESTA/data/packages" fi if [ ! -e "$pkg_dir/$package.pkg" ]; then - echo "Error: package $package not exist" + echo "Error: package $package doesn't exist" log_event "$E_NOTEXIST $EVENT" exit $E_NOTEXIST fi @@ -209,7 +209,7 @@ is_object_valid() { fi fi if [ -z "$sobject" ]; then - echo "Error: $2 $3 not exist" + echo "Error: $2 $3 doesn't exist" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi @@ -261,7 +261,7 @@ is_object_value_exist() { eval $str eval value=$4 if [ -z "$value" ] || [ "$value" = 'no' ]; then - echo "Error: ${4//$}=$value (not exist)" + echo "Error: ${4//$}=$value (doesn't exist)" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi diff --git a/func/rebuild.sh b/func/rebuild.sh index f69e109e..c08cfafc 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -525,8 +525,8 @@ rebuild_mysql_database() { echo "Database connection to MySQL host $HOST failed" |\ $send_mail -s "$subj" $email fi - log_event "$E_DB $EVENT" - exit $E_DB + log_event "$E_CONNECT $EVENT" + exit $E_CONNECT fi query="CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" @@ -568,8 +568,8 @@ rebuild_pgsql_database() { echo "Database connection to PostgreSQL host $HOST failed" |\ $send_mail -s "$subj" $email fi - log_event "$E_DB" "$EVENT" - exit $E_DB + log_event "$E_CONNECT" "$EVENT" + exit $E_CONNECT fi query="CREATE ROLE $DBUSER"