remove legacy code and add a general config file

[eostre.git] / drupal-automake-generic / files / do-mysql.sh

diff --git a/drupal-automake-generic/files/do-mysql.sh b/drupal-automake-generic/files/do-mysql.sh
index 350650db2b21dc903deeefde85285fdec77adb1b..ee2e4815a7b31a0f403cc3f7366f460d60d0c4eb 100644 (file)
--- a/drupal-automake-generic/files/do-mysql.sh
+++ b/drupal-automake-generic/files/do-mysql.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -xe
+. conf/conf
 
-DRUPAL_DB_PASSWORD="H0z7WC8Xq8yRE"
+DRUPAL_DB_PASSWORD="${DRUPAL_DB_PASSWORD:-password}"
 
 # install the mysql server
 apt install -y mariadb-server ||:
@@ -12,8 +13,8 @@ apt install -y mariadb-server ||:
 mysql_secure_installation < /sqldefaults
 
 # add the drupal db
-mysql -u root -p -e 'CREATE DATABASE dbd_drupal CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;'
-mysql -u root -p -e "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES ON dbd_drupal.* TO 'w_dbd'@'localhost' IDENTIFIED BY '$DRUPAL_DB_PASSWORD';"
+mysql -u root -e "CREATE DATABASE $DRUPAL_DB_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
+mysql -u root -e "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES ON $DRUPAL_DB_NAME.* TO '$DRUPAL_DB_USER'@'localhost' IDENTIFIED BY '$DRUPAL_DB_PASSWORD';"
 
 ## and have drupal do the site-install
 #cd /var/www/html