Change $VESTA to $HESTIA var.

Author: ScIT-Raphael

func/db.sh

@@ -1,14 +1,14 @@
 # MySQL
 mysql_connect() {
-    host_str=$(grep "HOST='$1'" $VESTA/conf/mysql.conf)
+    host_str=$(grep "HOST='$1'" $HESTIA/conf/mysql.conf)
     eval $host_str
     if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ]; then
         echo "Error: mysql config parsing failed"
         log_event "$E_PARSING" "$ARGUMENTS"
         exit $E_PARSING
     fi
 
-    mycnf="$VESTA/conf/.mysql.$HOST"
+    mycnf="$HESTIA/conf/.mysql.$HOST"
     if [ ! -e "$mycnf" ]; then
         echo "[client]">$mycnf
         echo "host='$HOST'" >> $mycnf
@@ -70,7 +70,7 @@ mysql_dump() {
 
 # PostgreSQL
 psql_connect() {
-    host_str=$(grep "HOST='$1'" $VESTA/conf/pgsql.conf)
+    host_str=$(grep "HOST='$1'" $HESTIA/conf/pgsql.conf)
     eval $host_str
     export PGPASSWORD="$PASSWORD"
     if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
@@ -117,7 +117,7 @@ get_next_dbhost() {
     if [ -z "$host" ] || [ "$host" == 'default' ]; then
         IFS=$'\n'
         host='EMPTY_DB_HOST'
-        config="$VESTA/conf/$type.conf"
+        config="$HESTIA/conf/$type.conf"
         host_str=$(grep "SUSPENDED='no'" $config)
         check_row=$(echo "$host_str"|wc -l)
 
@@ -146,7 +146,7 @@ get_next_dbhost() {
 
 # Database charset validation
 is_charset_valid() {
-    host_str=$(grep "HOST='$host'" $VESTA/conf/$type.conf)
+    host_str=$(grep "HOST='$host'" $HESTIA/conf/$type.conf)
     eval $host_str
 
     if [ -z "$(echo $CHARSETS | grep -wi $charset )" ]; then
@@ -158,7 +158,7 @@ is_charset_valid() {
 
 # Increase database host value
 increase_dbhost_values() {
-    host_str=$(grep "HOST='$host'" $VESTA/conf/$type.conf)
+    host_str=$(grep "HOST='$host'" $HESTIA/conf/$type.conf)
     eval $host_str
 
     old_dbbases="U_DB_BASES='$U_DB_BASES'"
@@ -175,13 +175,13 @@ increase_dbhost_values() {
         fi
     fi
 
-    sed -i "s/$old_dbbases/$new_dbbases/g" $VESTA/conf/$type.conf
-    sed -i "s/$old_users/$new_users/g" $VESTA/conf/$type.conf
+    sed -i "s/$old_dbbases/$new_dbbases/g" $HESTIA/conf/$type.conf
+    sed -i "s/$old_users/$new_users/g" $HESTIA/conf/$type.conf
 }
 
 # Decrease database host value
 decrease_dbhost_values() {
-    host_str=$(grep "HOST='$HOST'" $VESTA/conf/$TYPE.conf)
+    host_str=$(grep "HOST='$HOST'" $HESTIA/conf/$TYPE.conf)
     eval $host_str
 
     old_dbbases="U_DB_BASES='$U_DB_BASES'"
@@ -194,8 +194,8 @@ decrease_dbhost_values() {
         sed ':a;N;$!ba;s/\n/,/g')
     new_users="U_SYS_USERS='$U_SYS_USERS'"
 
-    sed -i "s/$old_dbbases/$new_dbbases/g" $VESTA/conf/$TYPE.conf
-    sed -i "s/$old_users/$new_users/g" $VESTA/conf/$TYPE.conf
+    sed -i "s/$old_dbbases/$new_dbbases/g" $HESTIA/conf/$TYPE.conf
+    sed -i "s/$old_users/$new_users/g" $HESTIA/conf/$TYPE.conf
 }
 
 # Create MySQL database
@@ -249,8 +249,8 @@ add_pgsql_database() {
 
 # Check if database host do not exist in config 
 is_dbhost_new() {
-    if [ -e "$VESTA/conf/$type.conf" ]; then
-        check_host=$(grep "HOST='$host'" $VESTA/conf/$type.conf)
+    if [ -e "$HESTIA/conf/$type.conf" ]; then
+        check_host=$(grep "HOST='$host'" $HESTIA/conf/$type.conf)
         if [ ! -z "$check_host" ]; then
             echo "Error: db host exist"
             log_event "$E_EXISTS" "$ARGUMENTS"
@@ -363,7 +363,7 @@ dump_pgsql_database() {
 
 # Check if database server is in use
 is_dbhost_free() {
-    host_str=$(grep "HOST='$host'" $VESTA/conf/$type.conf)
+    host_str=$(grep "HOST='$host'" $HESTIA/conf/$type.conf)
     eval $host_str
     if [ 0 -ne "$U_DB_BASES" ]; then
         echo "Error: host $HOST is used"

func/domain.sh

@@ -35,7 +35,7 @@ is_backend_template_valid() {
 
 # Web domain existence check
 is_web_domain_new() {
-    web=$(grep -F -H "DOMAIN='$1'" $VESTA/data/users/*/web.conf)
+    web=$(grep -F -H "DOMAIN='$1'" $HESTIA/data/users/*/web.conf)
     if [ ! -z "$web" ]; then
         if [ "$type" == 'web' ]; then
             check_result $E_EXISTS "Web domain $1 exist"
@@ -49,7 +49,7 @@ is_web_domain_new() {
 
 # Web alias existence check
 is_web_alias_new() {
-    web_alias=$(grep -wH "$1" $VESTA/data/users/*/web.conf)
+    web_alias=$(grep -wH "$1" $HESTIA/data/users/*/web.conf)
     if [ ! -z "$web_alias" ]; then
         a1=$(echo "$web_alias" |grep -F "'$1'" |cut -f 7 -d /)
         if [ ! -z "$a1" ] && [ "$2" == "web"  ]; then
@@ -160,8 +160,8 @@ prepare_web_domain_values() {
         ssl_ca_str='#'
     fi
     if [ "$SUSPENDED" = 'yes' ]; then
-        docroot="$VESTA/data/templates/web/suspend"
-        sdocroot="$VESTA/data/templates/web/suspend"
+        docroot="$HESTIA/data/templates/web/suspend"
+        sdocroot="$HESTIA/data/templates/web/suspend"
     fi
 }
 
@@ -360,7 +360,7 @@ is_dns_template_valid() {
 
 # DNS domain existence check
 is_dns_domain_new() {
-    dns=$(ls $VESTA/data/users/*/dns/$1.conf 2>/dev/null)
+    dns=$(ls $HESTIA/data/users/*/dns/$1.conf 2>/dev/null)
     if [ ! -z "$dns" ]; then
         if [ "$2" == 'dns' ]; then
             check_result $E_EXISTS "DNS domain $1 exists"
@@ -515,7 +515,7 @@ is_dns_nameserver_valid() {
 
 # Mail domain existence check
 is_mail_domain_new() {
-    mail=$(ls $VESTA/data/users/*/mail/$1.conf 2>/dev/null)
+    mail=$(ls $HESTIA/data/users/*/mail/$1.conf 2>/dev/null)
     if [ ! -z "$mail" ]; then
         if [ "$2" == 'mail' ]; then
             check_result $E_EXISTS "Mail domain $1 exists"

func/ip.sh

@@ -1,14 +1,14 @@
 # Check ip ownership
 is_ip_owner() {
-    owner=$(grep 'OWNER=' $VESTA/data/ips/$ip |cut -f 2 -d \')
+    owner=$(grep 'OWNER=' $HESTIA/data/ips/$ip |cut -f 2 -d \')
     if [ "$owner" != "$user" ]; then
         check_result $E_FORBIDEN "$ip is not owned by $user"
     fi
 }
 
 # Check if ip address is free
 is_ip_free() {
-    if [ -e "$VESTA/data/ips/$ip" ]; then
+    if [ -e "$HESTIA/data/ips/$ip" ]; then
         check_result $E_EXISTS "$ip is already exists"
     fi
 }
@@ -29,7 +29,7 @@ get_ip_iface() {
 # Check ip address specific value
 is_ip_key_empty() {
     key="$1"
-    string=$(cat $VESTA/data/ips/$ip)
+    string=$(cat $HESTIA/data/ips/$ip)
     eval $string
     eval value="$key"
     if [ ! -z "$value" ] && [ "$value" != '0' ]; then
@@ -42,7 +42,7 @@ is_ip_key_empty() {
 update_ip_value() {
     key="$1"
     value="$2"
-    conf="$VESTA/data/ips/$ip"
+    conf="$HESTIA/data/ips/$ip"
     str=$(cat $conf)
     eval $str
     c_key=$(echo "${key//$/}")
@@ -55,7 +55,7 @@ update_ip_value() {
 
 # Get ip name
 get_ip_alias() {
-    ip_name=$(grep "NAME=" $VESTA/data/ips/$local_ip |cut -f 2 -d \')
+    ip_name=$(grep "NAME=" $HESTIA/data/ips/$local_ip |cut -f 2 -d \')
     if [ ! -z "$ip_name" ]; then
         echo "${1//./-}.$ip_name"
     fi
@@ -67,8 +67,8 @@ increase_ip_value() {
     USER=$user
     web_key='U_WEB_DOMAINS'
     usr_key='U_SYS_USERS'
-    current_web=$(grep "$web_key=" $VESTA/data/ips/$sip |cut -f 2 -d \')
-    current_usr=$(grep "$usr_key=" $VESTA/data/ips/$sip |cut -f 2 -d \')
+    current_web=$(grep "$web_key=" $HESTIA/data/ips/$sip |cut -f 2 -d \')
+    current_usr=$(grep "$usr_key=" $HESTIA/data/ips/$sip |cut -f 2 -d \')
     if [ -z "$current_web" ]; then
         echo "Error: Parsing error"
         log_event "$E_PARSING" "$ARGUMENTS"
@@ -87,9 +87,9 @@ increase_ip_value() {
     fi
 
     sed -i "s/$web_key='$current_web'/$web_key='$new_web'/g" \
-        $VESTA/data/ips/$sip
+        $HESTIA/data/ips/$sip
     sed -i "s/$usr_key='$current_usr'/$usr_key='$new_usr'/g" \
-        $VESTA/data/ips/$sip
+        $HESTIA/data/ips/$sip
 }
 
 # Decrease ip value
@@ -99,8 +99,8 @@ decrease_ip_value() {
     web_key='U_WEB_DOMAINS'
     usr_key='U_SYS_USERS'
 
-    current_web=$(grep "$web_key=" $VESTA/data/ips/$sip |cut -f 2 -d \')
-    current_usr=$(grep "$usr_key=" $VESTA/data/ips/$sip |cut -f 2 -d \')
+    current_web=$(grep "$web_key=" $HESTIA/data/ips/$sip |cut -f 2 -d \')
+    current_usr=$(grep "$usr_key=" $HESTIA/data/ips/$sip |cut -f 2 -d \')
 
     if [ -z "$current_web" ]; then
         check_result $E_PARSING "Parsing error"
@@ -119,15 +119,15 @@ decrease_ip_value() {
     fi
 
     sed -i "s/$web_key='$current_web'/$web_key='$new_web'/g" \
-        $VESTA/data/ips/$sip
+        $HESTIA/data/ips/$sip
     sed -i "s/$usr_key='$current_usr'/$usr_key='$new_usr'/g" \
-        $VESTA/data/ips/$sip
+        $HESTIA/data/ips/$sip
 }
 
 # Get ip address value
 get_ip_value() {
     key="$1"
-    string=$(cat $VESTA/data/ips/$ip)
+    string=$(cat $HESTIA/data/ips/$ip)
     eval $string
     eval value="$key"
     echo "$value"
@@ -136,10 +136,10 @@ get_ip_value() {
 
 # Get real ip address
 get_real_ip() {
-    if [ -e "$VESTA/data/ips/$1" ]; then
+    if [ -e "$HESTIA/data/ips/$1" ]; then
         echo $1
     else
-        nat=$(grep -H "^NAT='$1'" $VESTA/data/ips/*)
+        nat=$(grep -H "^NAT='$1'" $HESTIA/data/ips/*)
         if [ ! -z "$nat" ]; then
             echo "$nat" |cut -f 1 -d : |cut -f 7 -d /
         fi
@@ -195,9 +195,9 @@ get_broadcast() {
 
 # Get user ips
 get_user_ips() {
-    dedicated=$(grep -H "OWNER='$user'" $VESTA/data/ips/*)
+    dedicated=$(grep -H "OWNER='$user'" $HESTIA/data/ips/*)
     dedicated=$(echo "$dedicated" |cut -f 1 -d : |sed 's=.*/==')
-    shared=$(grep -H -A1 "OWNER='admin'" $VESTA/data/ips/* |grep shared)
+    shared=$(grep -H -A1 "OWNER='admin'" $HESTIA/data/ips/* |grep shared)
     shared=$(echo "$shared" |cut -f 1 -d : |sed 's=.*/==' |cut -f 1 -d \-)
     for dedicated_ip in $dedicated; do
         shared=$(echo "$shared" |grep -v $dedicated_ip)
@@ -212,7 +212,7 @@ get_user_ip() {
         check_result $E_NOTEXIST "no IP is available"
     fi
     local_ip=$ip
-    nat=$(grep "^NAT" $VESTA/data/ips/$ip |cut -f 2 -d \')
+    nat=$(grep "^NAT" $HESTIA/data/ips/$ip |cut -f 2 -d \')
     if [ ! -z "$nat" ]; then
         ip=$nat
     fi
@@ -221,8 +221,8 @@ get_user_ip() {
 # Validate ip address
 is_ip_valid() {
     local_ip="$1"
-    if [ ! -e "$VESTA/data/ips/$1" ]; then
-        nat=$(grep -H "^NAT='$1'" $VESTA/data/ips/*)
+    if [ ! -e "$HESTIA/data/ips/$1" ]; then
+        nat=$(grep -H "^NAT='$1'" $HESTIA/data/ips/*)
         if [ -z "$nat" ]; then
             check_result $E_NOTEXIST "IP $1 doesn't exist"
         else
@@ -232,9 +232,9 @@ is_ip_valid() {
     fi
     if [ ! -z $2 ]; then
         if [ -z "$nat" ]; then
-            ip_data=$(cat $VESTA/data/ips/$1)
+            ip_data=$(cat $HESTIA/data/ips/$1)
         else
-            ip_data=$(cat $VESTA/data/ips/$nat)
+            ip_data=$(cat $HESTIA/data/ips/$nat)
         fi
         ip_owner=$(echo "$ip_data" |grep OWNER= |cut -f2 -d \')
         ip_status=$(echo "$ip_data" |grep STATUS= |cut -f2 -d \')