From c64a1fa7da3b26bb57d2b842e5e0c17dc8a74dd2 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 28 Oct 2013 23:03:56 +0530 Subject: [PATCH] start: use the DB_ env variables in the MYSQL CREATE and GRANT commands. --- resources/start | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/start b/resources/start index ec315594..1f46901e 100755 --- a/resources/start +++ b/resources/start @@ -53,8 +53,8 @@ EOF done if [ "${DB_INIT}" == "yes" ]; then - echo 'CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;' | mysql -uroot - echo 'GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'root'@'localhost';' | mysql -uroot + echo "CREATE DATABASE IF NOT EXISTS \`${DB_NAME}\` DEFAULT CHARACTER SET \`utf8\` COLLATE \`utf8_unicode_ci\`;" | mysql -uroot ${DB_PASS:+-p$DB_PASS} + echo "GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON \`${DB_NAME}\`.* TO 'root'@'localhost';" | mysql -uroot ${DB_PASS:+-p$DB_PASS} fi fi