|
|
@@ -973,8 +973,9 @@ if [ "$mysql" = 'yes' ]; then
|
|
|
check_result $? "mysql start failed"
|
|
|
|
|
|
# Securing MySQL/MariaDB installation
|
|
|
- mysqladmin -u root password $vpass
|
|
|
- echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf
|
|
|
+ mpass=$(gen_pass)
|
|
|
+ mysqladmin -u root password $mpass
|
|
|
+ echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf
|
|
|
chmod 600 /root/.my.cnf
|
|
|
mysql -e "DELETE FROM mysql.user WHERE User=''"
|
|
|
mysql -e "DROP DATABASE test" >/dev/null 2>&1
|
|
|
@@ -996,9 +997,10 @@ fi
|
|
|
#----------------------------------------------------------#
|
|
|
|
|
|
if [ "$postgresql" = 'yes' ]; then
|
|
|
+ ppass=$(gen_pass)
|
|
|
cp -f $hestiacp/postgresql/pg_hba.conf /etc/postgresql/*/main/
|
|
|
service postgresql restart
|
|
|
- sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'"
|
|
|
+ sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'"
|
|
|
|
|
|
# Configuring phpPgAdmin
|
|
|
if [ "$apache" = 'yes' ]; then
|
|
|
@@ -1231,13 +1233,13 @@ fi
|
|
|
|
|
|
# Configuring MySQL/MariaDB host
|
|
|
if [ "$mysql" = 'yes' ]; then
|
|
|
- $HESTIA/bin/v-add-database-host mysql localhost root $vpass
|
|
|
+ $HESTIA/bin/v-add-database-host mysql localhost root $mpass
|
|
|
$HESTIA/bin/v-add-database admin default default $(gen_pass) mysql
|
|
|
fi
|
|
|
|
|
|
# Configuring PostgreSQL host
|
|
|
if [ "$postgresql" = 'yes' ]; then
|
|
|
- $HESTIA/bin/v-add-database-host pgsql localhost postgres $vpass
|
|
|
+ $HESTIA/bin/v-add-database-host pgsql localhost postgres $ppass
|
|
|
$HESTIA/bin/v-add-database admin db db $(gen_pass) pgsql
|
|
|
fi
|
|
|
|
hestiacp