Skip to content

Commit dd485b7

Browse files
author
Kristan Kenney
committed
Show custom port with v-list-database-host scripts
1 parent 237d637 commit dd485b7

File tree

4 files changed

+54
-14
lines changed

4 files changed

+54
-14
lines changed

‎bin/v-add-database-host‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ check_args '4' "$#" "$args_usage"
6666

6767
if [ -z $charsets ]; then charsets="UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8"; fi
6868
if [ -z $template ]; then template="template1"; fi
69-
if [ -z $port ]; then
70-
if [ $type = 'mysql' ]; then port="3306"; fi
71-
if [ $type = 'pgsql' ]; then port="5432"; fi
72-
fi
69+
70+
database_set_default_ports
7371

7472
is_format_valid 'host' 'dbuser' 'max_db' 'charsets' 'template' 'port'
7573
#is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'

‎bin/v-list-database-host‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ format=${3-shell}
1616

1717
# Includes
1818
source $HESTIA/func/main.sh
19+
source $HESTIA/func/db.sh
1920

2021
# JSON list function
2122
json_list() {
2223
echo '{'
2324
echo ' "'$HOST'": {
2425
"HOST": "'$HOST'",
26+
"PORT": "'$PORT'",
2527
"TYPE": "'$type'",
2628
"CHARSETS": "'$CHARSETS'",
2729
"MAX_DB": "'$MAX_DB'",
@@ -38,6 +40,7 @@ json_list() {
3840
# SHELL list function
3941
shell_list() {
4042
echo "HOST: $HOST"
43+
echo "PORT: $PORT"
4144
echo "TYPE: $type"
4245
echo "CHARSETS: $CHARSETS"
4346
echo "MAX_DB: $MAX_DB"
@@ -51,15 +54,15 @@ shell_list() {
5154

5255
# PLAIN list function
5356
plain_list() {
54-
echo -ne "$HOST\t$type\t$CHARSETS\t$MAX_DB\t$U_SYS_USERS\t"
57+
echo -ne "$HOST\t$PORT\t$type\t$CHARSETS\t$MAX_DB\t$U_SYS_USERS\t"
5558
echo -e "$U_DB_BASES\t$TPL\t$SUSPENDED\t$TIME\t$DATE"
5659
}
5760

5861
# CSV list function
5962
csv_list() {
60-
echo -n "HOST,TYPE,CHARSETS,MAX_DB,U_SYS_USERS,"
63+
echo -n "HOST,PORT,TYPE,CHARSETS,MAX_DB,U_SYS_USERS,"
6164
echo "U_DB_BASES,TPL,SUSPENDED,TIME,DATE'"
62-
echo -n "$HOST,$type,\"$CHARSETS\",$MAX_DB,\"$U_SYS_USERS\","
65+
echo -n "$HOST,$PORT,$type,\"$CHARSETS\",$MAX_DB,\"$U_SYS_USERS\","
6366
echo "$U_DB_BASES,$TPL,$SUSPENDED,$TIME,$DATE"
6467
}
6568

@@ -81,6 +84,8 @@ is_format_valid 'host'
8184
is_type_format_valid "$type"
8285
is_object_valid "../../conf/$type" 'HOST' "$host"
8386

87+
# Set default port values if they don't exist in host configuration file
88+
database_set_default_ports
8489

8590
#----------------------------------------------------------#
8691
# Action #

‎bin/v-list-database-hosts‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ format=${1-shell}
1414

1515
# Includes
1616
source $HESTIA/func/main.sh
17+
source $HESTIA/func/db.sh
1718
source $HESTIA/conf/hestia.conf
1819

1920
# JSON list function
@@ -23,6 +24,8 @@ json_list() {
2324
objects=0
2425
for type in $(echo $DB_SYSTEM |sed -e 's/,/\n/'); do
2526
if [ -e "$HESTIA/conf/$type.conf" ]; then
27+
# Set default port values if they don't exist in database configuration file.
28+
database_set_default_ports
2629
db_hosts=$(grep HOST $HESTIA/conf/$type.conf |wc -l)
2730
objects=$((objects + db_hosts))
2831
fi
@@ -35,6 +38,7 @@ json_list() {
3538
parse_object_kv_list "$str"
3639
echo -n ' {
3740
"HOST": "'$HOST'",
41+
"PORT": "'$PORT'",
3842
"TYPE": "'$type'",
3943
"CHARSETS": "'$CHARSETS'",
4044
"MAX_DB": "'$MAX_DB'",
@@ -60,13 +64,15 @@ json_list() {
6064
# SHELL list function
6165
shell_list() {
6266
IFS=$'\n'
63-
echo "HOST TYPE MAX_DB DB_USED SPND TIME DATE"
64-
echo "---- ---- ------ ------- ---- ---- ----"
67+
echo "HOST PORT TYPE MAX_DB DB_USED SPND TIME DATE"
68+
echo "---- ---- ---- ------ ------- ---- ---- ----"
6569
for type in $(echo $DB_SYSTEM |sed -e 's/,/\n/'); do
6670
if [ -e "$HESTIA/conf/$type.conf" ]; then
71+
# Set default port values if they don't exist in database configuration file.
72+
database_set_default_ports
6773
for str in $(cat $HESTIA/conf/$type.conf); do
6874
parse_object_kv_list "$str"
69-
echo "$HOST $type $MAX_DB $U_DB_BASES $SUSPENDED $TIME $DATE"
75+
echo "$HOST $PORT $type $MAX_DB $U_DB_BASES $SUSPENDED $TIME $DATE"
7076
done
7177
fi
7278
done
@@ -77,9 +83,11 @@ plain_list() {
7783
IFS=$'\n'
7884
for type in $(echo $DB_SYSTEM |sed -e 's/,/\n/'); do
7985
if [ -e "$HESTIA/conf/$type.conf" ]; then
86+
# Set default port values if they don't exist in database configuration file.
87+
database_set_default_ports
8088
for str in $(cat $HESTIA/conf/$type.conf); do
8189
parse_object_kv_list "$str"
82-
echo -ne "$HOST\t$type\t$CHARSETS\t$MAX_DB\t$U_SYS_USERS\t"
90+
echo -ne "$HOST\t$PORT\t$type\t$CHARSETS\t$MAX_DB\t$U_SYS_USERS\t"
8391
echo -e "$U_DB_BASES\t$TPL\t$SUSPENDED\t$TIME\t$DATE"
8492
done
8593
fi
@@ -89,13 +97,15 @@ plain_list() {
8997
# CSV list function
9098
csv_list() {
9199
IFS=$'\n'
92-
echo -n "HOST,TYPE,CHARSETS,MAX_DB,U_SYS_USERS,"
100+
echo -n "HOST,PORT,TYPE,CHARSETS,MAX_DB,U_SYS_USERS,"
93101
echo "U_DB_BASES,TPL,SUSPENDED,TIME,DATE"
94102
for type in $(echo $DB_SYSTEM |sed -e 's/,/\n/'); do
95103
if [ -e "$HESTIA/conf/$type.conf" ]; then
104+
# Set default port values if they don't exist in database configuration file.
105+
database_set_default_ports
96106
for str in $(cat $HESTIA/conf/$type.conf); do
97107
parse_object_kv_list "$str"
98-
echo -n "$HOST,$type,\"$CHARSETS\",$MAX_DB,\"$U_SYS_USERS\","
108+
echo -n "$HOST,$PORT,$type,\"$CHARSETS\",$MAX_DB,\"$U_SYS_USERS\","
99109
echo "$U_DB_BASES,$TPL,$SUSPENDED,$TIME,$DATE"
100110
done
101111
fi
@@ -115,7 +125,6 @@ is_type_format_valid() {
115125
# Verifications #
116126
#----------------------------------------------------------#
117127

118-
119128
#----------------------------------------------------------#
120129
# Action #
121130
#----------------------------------------------------------#

‎func/db.sh‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
# Global
2+
database_set_default_ports() {
3+
4+
# Set default ports for MySQL and PostgreSQL
5+
mysql_default="3306"
6+
pgsql_default="5432"
7+
8+
# Handle missing values for both $PORT and $port
9+
# however don't override both at once or custom ports will be overridden.
10+
11+
if [ -z "$PORT" ]; then
12+
if [ "$type" = 'mysql' ]; then
13+
PORT="$mysql_default"
14+
fi
15+
if [ "$type" = 'pgsql' ]; then
16+
PORT="$pgsql_default"
17+
fi
18+
fi
19+
if [ -z "$port" ]; then
20+
if [ "$type" = 'mysql' ]; then
21+
port="$mysql_default"
22+
fi
23+
if [ "$type" = 'pgsql' ]; then
24+
port="$pgsql_default"
25+
fi
26+
fi
27+
}
28+
129
# MySQL
230
mysql_connect() {
331
host_str=$(grep "HOST='$1'" $HESTIA/conf/mysql.conf)

0 commit comments

Comments
 (0)