diff options
Diffstat (limited to 'satellit_installer/includes/10-handle_mysql.inc')
| -rw-r--r-- | satellit_installer/includes/10-handle_mysql.inc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/satellit_installer/includes/10-handle_mysql.inc b/satellit_installer/includes/10-handle_mysql.inc index 822a2b9..5b99719 100644 --- a/satellit_installer/includes/10-handle_mysql.inc +++ b/satellit_installer/includes/10-handle_mysql.inc @@ -1,13 +1,6 @@ -preset_mysql_root() { - # Presetting a root password for mysql so installer keeps quiet: - echo "Presetting root password for mysql: $MYSQL_ROOT_PASS" - debconf-set-selections <<< "mysql-server mysql-server/root_password password $MYSQL_ROOT_PASS" - debconf-set-selections <<< "mysql-server mysql-server/root_password_again password $MYSQL_ROOT_PASS" -} - mysql_add_db() { echo "# Creating mysql database $1..." - echo "create database $1;" | mysql -u root -p"$MYSQL_ROOT_PASS" + echo "create database $1;" | mysql -u root ERR=$? if [ "$ERR" -ne 0 ]; then perror "Could not create mysql database $1!" @@ -17,7 +10,7 @@ mysql_add_db() { mysql_delete_db() { # $1 database; $2 password echo "# Deleting mysql database $1..." - echo "drop database if exists $1;" | mysql -u root -p"${2}" + echo "drop database if exists $1;" | mysql -u root ERR=$? if [ "$ERR" -ne 0 ]; then perror "Could not delete mysql user $1!" @@ -28,7 +21,7 @@ mysql_delete_db() { mysql_add_user() { # $1=user, $2=database, $3=privileges, $4=password echo "# Adding user $1 for database $2, privileges $3..." - mysql -u root -p"$MYSQL_ROOT_PASS" <<-CMDS + mysql -u root <<-CMDS CREATE USER '$1'@'localhost' IDENTIFIED BY '$4'; GRANT $3 ON $2.* TO '$1'@'localhost'; CMDS @@ -42,7 +35,7 @@ mysql_add_user() { mysql_add_privs() { # $1=user, $2=database, $3=privileges echo "# Adding privileges $3 for user $1 on database $2..." - mysql -u root -p"$MYSQL_ROOT_PASS" <<-CMDS + mysql -u root <<-CMDS GRANT $3 ON $2 TO '$1'@'localhost'; CMDS @@ -65,7 +58,7 @@ mysql_delete_user() { mysql_import_dump() { # $1: dump file, $2: database echo "# Importing sql dump file $1..." - mysql -u root -p"$MYSQL_ROOT_PASS" -h localhost "$2" < "$1" + mysql -u root -h localhost "$2" < "$1" ERR=$? if [ "$ERR" -ne 0 ]; then perror "Could not import sql dump file $1!" |