You've already forked bash-helper
logic changes
This commit is contained in:
10
helper
10
helper
@@ -237,14 +237,14 @@ git_clone_if_missing() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Creates a MariaDB database and user
|
# Creates a MariaDB database and user for both localhost and 127.0.0.1
|
||||||
#
|
#
|
||||||
setup_mariadb() {
|
setup_mariadb() {
|
||||||
local mariapwd="$1" dbname="$2" dbuser="$3" dbpass="$4"
|
local mariapwd="$1" dbname="$2" dbuser="$3" dbpass="$4"
|
||||||
|
|
||||||
if [[ -z "$mariapwd" || -z "$dbname" || -z "$dbuser" || -z "$dbpass" ]]; then
|
if [[ -z "$mariapwd" || -z "$dbname" || -z "$dbuser" || -z "$dbpass" ]]; then
|
||||||
echo "Error: setup_mariadb requires mariapwd, dbname, dbuser, dbpass"
|
echo "Error: setup_mariadb requires mariapwd, dbname, dbuser, dbpass"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create a temporary MySQL defaults file
|
# Create a temporary MySQL defaults file
|
||||||
@@ -260,7 +260,9 @@ EOF
|
|||||||
mysql --defaults-extra-file="$tmpfile" <<EOF
|
mysql --defaults-extra-file="$tmpfile" <<EOF
|
||||||
CREATE DATABASE IF NOT EXISTS \`$dbname\`;
|
CREATE DATABASE IF NOT EXISTS \`$dbname\`;
|
||||||
CREATE USER IF NOT EXISTS '$dbuser'@'localhost' IDENTIFIED BY '$dbpass';
|
CREATE USER IF NOT EXISTS '$dbuser'@'localhost' IDENTIFIED BY '$dbpass';
|
||||||
|
CREATE USER IF NOT EXISTS '$dbuser'@'127.0.0.1' IDENTIFIED BY '$dbpass';
|
||||||
GRANT ALL PRIVILEGES ON \`$dbname\`.* TO '$dbuser'@'localhost';
|
GRANT ALL PRIVILEGES ON \`$dbname\`.* TO '$dbuser'@'localhost';
|
||||||
|
GRANT ALL PRIVILEGES ON \`$dbname\`.* TO '$dbuser'@'127.0.0.1';
|
||||||
FLUSH PRIVILEGES;
|
FLUSH PRIVILEGES;
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user