Remove nested config variables

deploy/init.sh

@@ -2,6 +2,8 @@
 
 set -ex
 
+# TODO Doesn't scale, find another way to wait until db is ready
+sleep 40
 go get github.com/ewhal/nyaa
 go build
 ./nyaa -host 0.0.0.0 \

deploy/postgres.env

@@ -3,4 +3,7 @@ POSTGRES_PASSWORD=nyaapantsu
 POSTGRES_DB=nyaapantsu
 
 PANTSU_DBTYPE=postgres
-PANTSU_DBPARAMS=host=pantsu_db user=${POSTGRES_USER} dbname=${POSTGRES_DB} sslmode=disable password=${POSTGRES_PASSWORD}
+# TODO Would prefer to use the line below but docker doesn't seem to accept
+# that.
+#PANTSU_DBPARAMS=host=pantsu_db user=${POSTGRES_USER} dbname=${POSTGRES_DB} sslmode=disable password=${POSTGRES_PASSWORD}
+PANTSU_DBPARAMS=host=pantsu_db user=nyaapantsu dbname=nyaapantsu sslmode=disable password=nyaapantsu

service/torrent/torrent.go

@@ -71,7 +71,6 @@ func GetTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offs
 	}
 	dbQuery.Order(orderBy).Find(&torrents)
 	return torrents, count
-
 }
 
 /* Functions to simplify the get parameters of the main function