From 108373f938614796e53091360effef6b1bf06596 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 14 May 2018 18:49:19 -0500 Subject: [PATCH] Bring back database.yml It only contains the development database configuration by default since we're relying on docker-compose for starting our database now. --- .gitignore | 1 - config/database.yml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 config/database.yml diff --git a/.gitignore b/.gitignore index c7069277..43a6ebc4 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ /log/*.log /public/assets/ /tmp -config/database.yml config/deploy.rb config/site.yml db/data.yml diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 00000000..7470d4e0 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,22 @@ +development: + adapter: mysql2 + database: tracks + # set this if you are storing utf8 in your mysql database to handle strings + # like "Réné". Not needed for sqlite. For PostgreSQL use encoding: unicode + # encoding: utf8 + host: db + username: root + password: + +# Production config is disabled by default +# +# production: +# adapter: mysql2 +# database: tracks +# # set this if you are storing utf8 in your mysql database to handle strings +# # like "Réné".Not needed for sqlite. For PostgreSQL use encoding: unicode +# # encoding: utf8 +# host: localhost +# username: root +# password: +