Refactoring stage III (db)

Author: serghey-rodin

bin/v_add_db_base bin/v_add_databasebin/v_add_db_base renamed to bin/v_add_database

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add database
-# options: user db db_user db_password type [host] [encoding]
+# options: user database dbuser dbpass type [host] [charset]
 #
 # The function creates the database concatenating username  and user_db.
 # Supported yypes of databases you can get using v_list_sys_config script.
@@ -22,8 +22,8 @@ dbuser="$user"_"$3"
 dbpass=$4
 type=$5
 host=$6
-encoding=${7-UTF8}
-encoding=$(echo "$encoding" |tr '[:lower:]' '[:upper:]')
+charset=${7-UTF8}
+charset=$(echo "$charset" |tr '[:lower:]' '[:upper:]')
 
 # Includes
 source $VESTA/conf/vesta.conf
@@ -35,16 +35,17 @@ source $VESTA/func/db.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '5' "$#" 'user db dbuser dbpass type [host] [encoding]'
-validate_format 'user' 'database' 'dbuser' 'dbpass' 'encoding'
+check_args '5' "$#" 'user database dbuser dbpass type [host] [charset]'
+validate_format 'user' 'database' 'dbuser' 'dbpass' 'charset'
 is_system_enabled "$DB_SYSTEM"
 is_type_valid "$DB_SYSTEM" "$type"
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_free 'db' 'DB' "$database"
 get_next_dbhost
 is_object_valid "../../../conf/$type" 'HOST' "$host"
-is_db_encoding_valid
+is_object_unsuspended "../../../conf/$type" 'HOST' "$host"
+is_charset_valid
 is_package_full 'DATABASES'
 
 #----------------------------------------------------------#
@@ -53,8 +54,8 @@ is_package_full 'DATABASES'
 
 # Switching on db type
 case $type in
-    mysql) create_db_mysql ;;
-    pgsql) create_db_pgsql ;;
+    mysql) add_mysql_database ;;
+    pgsql) add_pgsql_database ;;
 esac
 
 
@@ -67,15 +68,15 @@ increase_dbhost_values
 increase_user_value "$user" '$U_DATABASES'
 
 # Adding db to db conf
-v_str="DB='$database' USER='$dbuser' HOST='$host' TYPE='$type'"
-v_str="$v_str CHARSET='$encoding' U_DISK='0' SUSPENDED='no' TIME='$TIME'"
-v_str="$v_str DATE='$DATE'"
-echo "$v_str" >> $USER_DATA/db.conf
+str="DB='$database' DBUSER='$dbuser' HOST='$host' TYPE='$type'"
+str="$str CHARSET='$charset' U_DISK='0' SUSPENDED='no' TIME='$TIME'"
+str="$str DATE='$DATE'"
+echo "$str" >> $USER_DATA/db.conf
 chmod 660 $USER_DATA/db.conf
 
 # Hiding password
 EVENT="DATE='$DATE' TIME='$TIME' COMMAND='$SCRIPT'"
-EVENT="$EVENT ARGUMENTS='$user $database $dbuser ***** $type $host'"
+EVENT="$EVENT ARGUMENTS='$user $database $dbuser ***** $type $host $charset'"
 
 # Logging
 log_history "$EVENT"

bin/v_add_db_host bin/v_add_database_serverbin/v_add_db_host renamed to bin/v_add_database_server

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add new database server
-# options: type host port db_user db_password [max_db] [tpl]
+# options: type host port dbuser dbpass [max_db] [charsets] [template]
 #
 # The function add new database server to the server pool. It supports local
 # and remote database servers, which is useful for clusters. By adding a host
@@ -17,13 +17,13 @@
 type=$1
 host=$2
 port=$3
-db_user=$4
-db_password=$5
+dbuser=$4
+dbpass=$5
 max_db=${6-300}
-template=${7-template1}
+charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8}
+template=${8-template1}
 
-
-# Importing variables
+# Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/shared.sh
 source $VESTA/func/db.sh
@@ -33,24 +33,12 @@ source $VESTA/func/db.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-# Checking arg number
-args_usage='type host port db_user db_password [max_db] [tpl]'
+args_usage='type host port dbuser dbpass [max_db] [charsets] [tpl]'
 check_args '5' "$#" "$args_usage"
-
-# Checking argument format
-validate_format 'host' 'port' 'db_user' 'db_password' 'max_db'
-validate_format 'template'
-
-# Checking db system is enabled
-is_system_enabled 'DB_SYSTEM'
-
-# Checking db type
+validate_format 'host' 'port' 'dbuser' 'dbpass' 'max_db' 'charsets' 'template'
+is_system_enabled "$DB_SYSTEM"
 is_type_valid "$DB_SYSTEM" "$type"
-
-# Checking host existance
-is_db_host_new
-
-# Checking host connection
+is_dbhost_new
 case $type in
     mysql) is_mysql_host_alive ;;
     pgsql) is_pgsql_host_alive ;;
@@ -63,26 +51,28 @@ esac
 
 # Concatentating db host string
 case $type in
-    mysql) new_str="HOST='$host' USER='$db_user' PASSWORD='$db_password'";
-            new_str="$new_str PORT='$port' MAX_DB='$max_db' U_SYS_USERS=''";
-            new_str="$new_str U_DB_BASES='0'  ACTIVE='yes' DATE='$DATE'";;
-    pgsql) new_str="HOST='$host' USER='$db_user' PASSWORD='$db_password'";
-            new_str="$new_str PORT='$port' TPL='$template'";
-            new_str="$new_str MAX_DB='$max_db' U_SYS_USERS=''";
-            new_str="$new_str U_DB_BASES='0' ACTIVE='yes' DATE='$DATE'";;
+    mysql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass' PORT='$port'";
+           str="$str CHARSETS='$charsets' MAX_DB='$max_db' U_SYS_USERS='' ";
+           str="$str U_DB_BASES='0' SUSPENDED='no' TIME='$TIME' DATE='$DATE'";;
+    pgsql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass' PORT='$port'";
+           str="$str CHARSETS='$charsets' TPL='$template' MAX_DB='$max_db'";
+           str="$str U_SYS_USERS='' U_DB_BASES='0' SUSPENDED='no'";
+           str="$str TIME='$TIME' DATE='$DATE'";;
 esac
 
 # Adding host to conf
-echo "$new_str" >> $VESTA/conf/$type.conf
+echo "$str" >> $VESTA/conf/$type.conf
 chmod 660 $VESTA/conf/$type.conf
 
 
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Hidding db pass
-EVENT=$(echo $EVENT | sed -e "s/$db_password/xxxxxx/g")
+# Hiding password
+EVENT="DATE='$DATE' TIME='$TIME' COMMAND='$SCRIPT'"
+EVENT="$EVENT ARGUMENTS='$type $host $port $dbuser ****** $max_db $charsets"
+EVENT="$EVENT $tpl'"
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v_change_db_password bin/v_change_database_passwordbin/v_change_db_password renamed to bin/v_change_database_password

@@ -1,6 +1,6 @@
 #!/bin/bash
-# info: change database user password
-# options: user db_name db_password
+# info: change database password
+# options: user database dbpass
 #
 # The function for changing database user  password to a database. It uses the
 # full name of database as argument.
@@ -13,9 +13,9 @@
 # Argument defenition
 user=$1
 database=$2
-db_password=$3
+dbpass=$3
 
-# Importing variables
+# Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/shared.sh
 source $VESTA/func/db.sh
@@ -25,41 +25,24 @@ source $VESTA/func/db.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-# Checking arg number
-check_args '3' "$#" 'user db_name db_password'
-
-# Checking argument format
-validate_format 'user' 'database' 'db_password'
-
-# Checking db system is enabled
-is_system_enabled 'DB_SYSTEM'
-
-# Checking user
+check_args '3' "$#" 'user database dbpass'
+validate_format 'user' 'database' 'dbpass'
+is_system_enabled "$DB_SYSTEM"
 is_object_valid 'user' 'USER' "$user"
-
-# Checking user is active
 is_object_unsuspended 'user' 'USER' "$user"
-
-# Checking db existance
-is_db_valid
-
-# Checking db is active
-is_db_suspended
+is_object_valid 'db' 'DB' "$database"
+is_object_unsuspended 'db' 'DB' "$database"
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
+# Get database values
+get_database_values
 
-# Define database variables
-db_user=$(get_db_value '$USER')
-host=$(get_db_value '$HOST')
-type=$(get_db_value '$TYPE')
-
-# Switching on db type
-case $type in
-    mysql) change_db_mysql_password ;;
-    pgsql) change_db_pgsql_password ;;
+case $TYPE in
+    mysql) change_mysql_password ;;
+    pgsql) change_pgsql_password ;;
 esac
 
 
@@ -68,7 +51,8 @@ esac
 #----------------------------------------------------------#
 
 # Hiding password
-EVENT="$DATE $SCRIPT $user $database *****"
+EVENT="DATE='$DATE' TIME='$TIME' COMMAND='$SCRIPT'"
+EVENT="$EVENT ARGUMENTS='$user $database *****'"
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v_delete_db_base bin/v_delete_databasebin/v_delete_db_base renamed to bin/v_delete_database

@@ -14,7 +14,7 @@
 user=$1
 database=$2
 
-# Importing variables
+# Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/shared.sh
 source $VESTA/func/db.sh
@@ -24,57 +24,40 @@ source $VESTA/func/db.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-# Checking arg number
-check_args '2' "$#" 'user db_name'
-
-# Checking argument format
+check_args '2' "$#" 'user database'
 validate_format 'user' 'database'
-
-# Checking db system is enabled
-is_system_enabled 'DB_SYSTEM'
-
-# Checking user
+is_system_enabled "$DB_SYSTEM"
 is_object_valid 'user' 'USER' "$user"
-
-# Checking user is active
 is_object_unsuspended 'user' 'USER' "$user"
-
-# Checking db existance
-is_db_valid
-
-# Checking db is active
-is_db_suspended
+is_object_valid 'db' 'DB' "$database"
+is_object_unsuspended 'db' 'DB' "$database"
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get some variables we do not have now
-db_user=$(get_db_value '$USER')
-host=$(get_db_value '$HOST')
-type=$(get_db_value '$TYPE')
+# Get database values
+get_database_values
 
 # Switching on db type
-case $type in
-    mysql) del_db_mysql ;;
-    pgsql) del_db_pgsql ;;
+case $TYPE in
+    mysql) delete_mysql_database ;;
+    pgsql) delete_pgsql_database ;;
 esac
 
 
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Decreasing db value
-decrease_db_value
+# Deleting database
+sed -i "/DB='$database' /d" $USER_DATA/db.conf
 
-# Decreasing domain value
+# Decreasing counters
+decrease_dbhost_values
 decrease_user_value "$user" '$U_DATABASES'
 
-# Deleting vesta db record
-del_db_vesta
-
 # Logging
 log_event "$OK" "$EVENT"
 

bin/v_delete_db_host bin/v_delete_database_serverbin/v_delete_db_host renamed to bin/v_delete_database_server

@@ -1,5 +1,5 @@
 #!/bin/bash
-# info: delete database serve
+# info: delete database server
 # options: type host
 #
 # The function for deleting the database host from vesta configuration. It will
@@ -24,31 +24,19 @@ source $VESTA/func/db.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-# Checking arg number
-check_args '2' "$#" 'type host'
-
-# Checking argument format
-validate_format 'host'
-
-# Checking db system is enabled
-is_system_enabled 'DB_SYSTEM'
-
-# Checking db type
+check_args '2' "$#" "type host"
+validate_format 'type' 'host'
+is_system_enabled "$DB_SYSTEM"
 is_type_valid "$DB_SYSTEM" "$type"
-
-# Checking host existance
-is_db_host_valid
-
-# Checking db host users
-is_db_host_free
+is_object_valid "../../conf/$type" 'HOST' "$host"
+is_dbhost_free
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
-
-# Deleting host from conf
-del_dbhost_vesta
+# Deleting server
+sed -i "/HOST='$host' /d" $VESTA/conf/$type.conf
 
 
 #----------------------------------------------------------#