Skip to content

Commit

Permalink
config(core): Push Halyard config to base (#1192)
Browse files Browse the repository at this point in the history
The redis url is being set in the Halyard-specific file that is
concatenated to the config; let's just move that defaulting to
the base gate.yml.

This should not cause any visible change to non-Halyard users, as
we are defaulting back to the same localhost:6379 if the redis
override is not defined. It will also not affect Halyard users as
it's just changing where we set this value for them.
  • Loading branch information
ezimanyi committed May 8, 2020
1 parent b2077e2 commit b95facc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gate-web/config/gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ services:
baseUrl: http://localhost:8090

redis:
connection: redis://localhost:6379
connection: ${services.redis.baseUrl:redis://localhost:6379}

slack:
baseUrl: https://slack.com/api
Expand Down
6 changes: 6 additions & 0 deletions halconfig/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This directory contains skeleton gate configs to which Halyard concatenates
its generated deployment-specific config.

These configs are **deprecated** and in general should not be further updated. To
set a default config value, either set the value in `gate-web/config/gate.yml`
or set a default in the code reading the config property.
3 changes: 0 additions & 3 deletions halconfig/gate.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
# halconfig

redis:
connection: ${services.redis.baseUrl:redis://localhost:6379}

0 comments on commit b95facc

Please sign in to comment.