many little changes all in a line.
my feature branch touches too many things. fix merge conflicts in rebase to main.
This commit is contained in:
parent
30b2d88f6a
commit
40a49c1c25
|
|
@ -36,6 +36,8 @@
|
||||||
(:module :config
|
(:module :config
|
||||||
:components ((:file radiance-postgres)))
|
:components ((:file radiance-postgres)))
|
||||||
(:file "conditions")
|
(:file "conditions")
|
||||||
|
(:module :config
|
||||||
|
:components ((:file radiance-postgres)))
|
||||||
(:file "database")
|
(:file "database")
|
||||||
(:file "template-utils")
|
(:file "template-utils")
|
||||||
(:file "stream-media")
|
(:file "stream-media")
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
(setf (config :database :connection)
|
(setf (config :database :connection)
|
||||||
'(:type :postgres
|
'(:type :postgres
|
||||||
:host "localhost" ; Change to "asteroid-postgres" when running in Docker
|
:host "localhost" ; Change to "asteroid-postgres" when running in Docker
|
||||||
|
;; :host "asteroid-postgres"
|
||||||
:port 5432
|
:port 5432
|
||||||
:database "asteroid"
|
:database "asteroid"
|
||||||
:username "asteroid"
|
:username "asteroid"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue