From 2e190b1af96b0836684339bfb4353a17cf28f0b9 Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Tue, 13 Jun 2017 21:51:56 -0400 Subject: Read db configuration from config.json --- Makefile | 4 ++-- config_sample.json | 2 +- 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": "" -- cgit v1.2.3-70-g09d2