+
diff --git a/data/templates/skel/public_shtml/index.html b/data/templates/skel/public_shtml/index.html
index f757746f7..1a191891a 100644
--- a/data/templates/skel/public_shtml/index.html
+++ b/data/templates/skel/public_shtml/index.html
@@ -1,21 +1,29 @@
-
-
-
-
%domain%
-
- apache +
- nginx +
- percona +
- vesta
-
+
%domain%
+
+
diff --git a/func/cron.func b/func/cron.func
index 6c4fc230e..e3626381b 100644
--- a/func/cron.func
+++ b/func/cron.func
@@ -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
}
diff --git a/func/db.func b/func/db.func
index bef3ccc4f..08a073837 100644
--- a/func/db.func
+++ b/func/db.func
@@ -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
diff --git a/func/domain.func b/func/domain.func
index afd3209a0..a696d4b90 100644
--- a/func/domain.func
+++ b/func/domain.func
@@ -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
diff --git a/func/ip.func b/func/ip.func
index b4ba4d741..811b415c9 100644
--- a/func/ip.func
+++ b/func/ip.func
@@ -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"
}
diff --git a/func/shared.func b/func/shared.func
index e42a75c4f..168fadc5a 100644
--- a/func/shared.func
+++ b/func/shared.func
@@ -6,9 +6,8 @@ log_event() {
# Checking logging system
if [ "$LOG_SYSTEM" = 'yes' ]; then
- # Checking logging level
- log=$(echo "$LOG_LEVEL" | cut -f 2 -d \' | grep -w "$level" )
- if [ ! -z "$log" ]; then
+ log=$(echo "$LOG_LEVEL" | grep -w "$level" )
+ if [ -n "$log" ]; then
echo "$event" >> $V_LOG/$level.log
fi
fi
@@ -25,20 +24,8 @@ log_history() {
fi
}
-# External function result checker
-check_func_result() {
-
- return_code="$1"
-
- if [[ "$return_code" -ne "$OK" ]]; then
- log_event 'debug' "$return_code $V_EVENT"
- exit $return_code
- fi
-}
-
# Argument list checker
check_args() {
-
sys_args="$1"
user_args="$2"
usage="$3"
@@ -46,8 +33,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
}
@@ -62,9 +49,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
}
@@ -76,8 +63,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
}
@@ -88,8 +75,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
}
@@ -99,27 +86,27 @@ format_validation() {
# Defining exlude mask
special_chars=$(echo "$val" | \
- grep -c "[!|@|#|$|^|&|*|(|)|-|+|=|{|}|:|_|,|.|<|>|?|/|\|\"|'|;|%]" )
+ grep -c "[!|@|#|$|^|&|*|(|)|-|+|=|{|}|:|_|,|.|<|>|?|/|\|\"|'|;|%| ]" )
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
}
@@ -136,8 +123,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
}
@@ -150,8 +137,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
}
@@ -168,8 +155,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
}
@@ -183,8 +170,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
}
@@ -194,13 +181,13 @@ format_validation() {
# Defining exlude mask
special_chars=$(echo "$val" | \
- grep -c "[!|@|#|$|^|&|*|(|)|+|=|{|}|:| |,|<|>|?|/|\|\"|'|;|%]" )
+ grep -c "[!|@|#|$|^|&|*|(|)|+|=|{|}|:| |,|<|>|?|/|\|\"|'|;|%| ]" )
# 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
}
@@ -210,14 +197,14 @@ format_validation() {
# Defining exlude mask
special_chars=$(echo "$val" | \
- grep -c "[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%]" )
+ grep -c "[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%| ]" )
needed_chars=$(echo "$val" | cut -s -f 2 -d '.')
# 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
}
@@ -227,13 +214,13 @@ format_validation() {
# Defining exlude mask
special_chars=$(echo "$val" | \
- grep -c "[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%]" )
+ grep -c "[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%| ]" )
# 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
}
@@ -244,8 +231,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
}
@@ -271,8 +258,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
}
@@ -283,8 +270,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
}
@@ -297,8 +284,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
@@ -373,48 +360,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
+ if [ "$PROXY_SYSTEM" != 'nginx' ]; then
+ echo "Error: proxy hosting support disabled"
+ log_event 'debug' "$E_DISABLED $V_EVENT"
+ 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
}
@@ -432,17 +419,17 @@ is_system_enabled() {
# System user check
is_user_valid() {
search_user="${1-$user}"
- check_user=$(cut -f 1 -d : /etc/passwd | grep -w "$search_user" )
+ 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
}
@@ -451,8 +438,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
}
@@ -468,8 +455,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
}
@@ -483,8 +470,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
}
@@ -493,8 +480,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
@@ -502,8 +489,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
}
@@ -515,8 +502,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
}
@@ -528,8 +515,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
}
@@ -547,50 +534,12 @@ 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
}
-is_package_avalable() {
- # Parsing user data
- usr_data=$(cat $V_USERS/$user/user.conf)
- for key in $usr_data; do
- eval ${key%%=*}=${key#*=}
- done
-
- # Clearing vars
- WEB_DOMAINS='0'
- WEB_SSL='0'
- DATABASES='0'
- MAIL_DOMAINS='0'
- MAIL_BOXES='0'
- MAIL_FORWARDERS='0'
- DNS_DOMAINS='0'
- DISK_QUOTA='0'
- BANDWIDTH='0'
-
- # Parsing package
- pkg_data=$(cat $V_PKG/$package.pkg)
- for key in $pkg_data; do
- eval ${key%%=*}=${key#*=}
- done
-
- # Comparing user data with package
- if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ] ||\
- [ "$WEB_SSL" -lt "$U_WEB_SSL" ] ||\
- [ "$DATABASES" -lt "$U_DATABASES" ] ||\
- [ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ] ||\
- [ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ] ||\
- [ "$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
- fi
-}
-
is_template_valid() {
stype="$1"
@@ -604,8 +553,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
}
@@ -616,8 +565,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
}
@@ -627,8 +576,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
}
@@ -676,45 +625,11 @@ restart_schedule() {
fi
}
-is_user_free() {
- # Parsing domain values
- check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" )
-
- # 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
- fi
-}
-
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
- fi
-}
-
-is_user_key_empty() {
- key="$1"
-
- # Parsing ip
- string=$(cat $V_USERS/$user/user.conf )
-
- # Parsing key=value
- for keys in $string; do
- eval ${keys%%=*}=${keys#*=}
- done
-
- # Self reference
- eval value="$key"
-
- # Checkng key
- if [ ! -z "$value" ] && [ "$value" != 'no' ] && [ "$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_NOTEXIST $v_log"
+ exit $E_NOTEXIST
fi
}
@@ -763,8 +678,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
@@ -792,78 +707,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
- fi
-}
-
-change_user_package() {
- # Parsing user data
- usr_data=$(cat $V_USERS/$user/user.conf)
- for key in $usr_data; do
- eval ${key%%=*}=${key#*=}
- done
-
- # Parsing package
- pkg_data=$(cat $V_PKG/$package.pkg)
- for key in $pkg_data; do
- eval ${key%%=*}=${key#*=}
- done
-
- echo "FNAME='$FNAME'
-LNAME='$LNAME'
-PACKAGE='$package'
-WEB_DOMAINS='$WEB_DOMAINS'
-WEB_SSL='$WEB_SSL'
-WEB_ALIASES='$WEB_ALIASES'
-DATABASES='$DATABASES'
-MAIL_DOMAINS='$MAIL_DOMAINS'
-MAIL_BOXES='$MAIL_BOXES'
-MAIL_FORWARDERS='$MAIL_FORWARDERS'
-DNS_DOMAINS='$DNS_DOMAINS'
-DISK_QUOTA='$DISK_QUOTA'
-BANDWIDTH='$BANDWIDTH'
-NS='$NS'
-SHELL='$SHELL'
-BACKUPS='$BACKUPS'
-WEB_TPL='$WEB_TPL'
-SUSPENDED='$SUSPENDED'
-CONTACT='$CONTACT'
-REPORTS='$REPORTS'
-IP_OWNED='$IP_OWNED'
-U_DIR_DISK='$U_DIR_DISK'
-U_DISK='$U_DISK'
-U_BANDWIDTH='$U_BANDWIDTH'
-U_WEB_DOMAINS='$U_WEB_DOMAINS'
-U_WEB_SSL='$U_WEB_SSL'
-U_DNS_DOMAINS='$U_DNS_DOMAINS'
-U_DATABASES='$U_DATABASES'
-U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
-DATE='$DATE'" > $V_USERS/$user/user.conf
-}
-
-get_shell_path() {
- check_shell=$(/usr/bin/chsh --list-shells | grep -w "$shell" )
- echo "$check_shell"
-}
-
-is_user_value_exist() {
- key="$1"
- string=$(cat $V_USERS/$user/user.conf )
-
- # Parsing key=value
- for keys in $string; do
- eval ${keys%%=*}=${keys#*=}
- done
-
- # Self reference
- eval value="$key"
-
- # 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_INVALID $V_EVENT"
+ exit $E_INVALID
fi
}
@@ -881,8 +726,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
@@ -907,9 +752,7 @@ json_list() {
while read line; do
# Assing key=value pair
- for key in $line; do
- eval ${key%%=*}=${key#*=}
- done
+ eval $line
# Closing bracket if there already was output
if [ -n "$data" ]; then
@@ -960,9 +803,7 @@ shell_list() {
# Reading file line by line
while read line ; do
# Assing key=value pair
- for key in $line; do
- eval ${key%%=*}=${key#*=}
- done
+ eval $line
# Print result
eval echo "$fields"
@@ -1028,29 +869,12 @@ get_usr_traff() {
echo "$size"
}
-get_config_value() {
- key="$1"
- # Parsing config
- string=$(cat $V_CONF/vesta.conf)
-
- # Parsing key=value
- for keys in $string; do
- eval ${keys%%=*}=${keys#*=}
- done
-
- # Self reference
- eval value="$key"
-
- # Print value
- echo "$value"
-}
-
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
}
diff --git a/src/v_check_sys_user_password.c b/src/v_check_sys_user_password.c
index 1597b61d8..0dcaa7ede 100755
--- a/src/v_check_sys_user_password.c
+++ b/src/v_check_sys_user_password.c
@@ -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;