aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut Horel <thibaut.horel@gmail.com>2017-06-13 21:51:56 -0400
committerThibaut Horel <thibaut.horel@gmail.com>2017-06-13 21:51:56 -0400
commit2e190b1af96b0836684339bfb4353a17cf28f0b9 (patch)
tree920a31ea866f78d0e0f3bbfbe2a0d4f7e1f28d56
parent665845a7e5050a57e6dee05a3055e2a973e1e108 (diff)
downloadlastfm-api-2e190b1af96b0836684339bfb4353a17cf28f0b9.tar.gz
Read db configuration from config.json
-rw-r--r--Makefile4
-rw-r--r--config_sample.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 759e09f..5d95879 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DB=sslmode=disable dbname=lastfm
+DB=$(shell cat config.json | jq '.Database')
all: kill build start
@@ -22,4 +22,4 @@ down:
goose -dir migrations postgres "$(DB)" down
status:
- goose -dir migrations postgres "$(DB)" status
+ goose -dir migrations postgres $(DB) status
diff --git a/config_sample.json b/config_sample.json
index 62b9d0b..9df1653 100644
--- a/config_sample.json
+++ b/config_sample.json
@@ -7,7 +7,7 @@
},
"HashKey": "",
"BlockKey": "",
- "Database": "postgres://thibaut@localhost/lastfm?sslmode=disable",
+ "Database": "dbname=lastfm sslmode=disable",
"Lfm": {
"ApiKey": "",
"SharedSecret": ""