Skip to content

hoh simplify config #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 21, 2023
Merged

hoh simplify config #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ae0426
Fix: Users had to override many defaults during deployment
hoh Apr 14, 2023
331c642
ci config
odesenfans Apr 21, 2023
3aeba7f
fix
odesenfans Apr 21, 2023
078c5e7
revert previous solution and hardcode instead
odesenfans Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/aleph/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def get_defaults():
"sync_contract": "KT1FfEoaNvooDfYrP61Ykct6L8z7w7e2pgnT",
},
"postgres": {
"host": "127.0.0.1",
"host": "postgres",
"port": 5432,
"database": "aleph",
"user": "aleph",
Expand All @@ -105,7 +105,7 @@ def get_defaults():
},
"ipfs": {
"enabled": True,
"host": "127.0.0.1",
"host": "ipfs",
"port": 5001,
"gateway_port": 8080,
"id": None,
Expand All @@ -118,7 +118,7 @@ def get_defaults():
],
},
"rabbitmq": {
"host": "127.0.0.1",
"host": "rabbitmq",
"port": 5672,
"username": "aleph-p2p",
"password": "change-me!",
Expand All @@ -127,7 +127,7 @@ def get_defaults():
"message_exchange": "aleph-messages",
},
"redis": {
"host": "127.0.0.1",
"host": "redis",
"port": 6379,
},
"sentry": {
Expand Down
6 changes: 6 additions & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ def session_factory(mock_config):
@pytest.fixture
def mock_config(mocker):
config = Config(aleph.config.get_defaults())

# The postgres/redis hosts use Docker network names in the default config.
# We always use localhost for tests.
config.postgres.host.value = "127.0.0.1"
config.redis.host.value = "127.0.0.1"

# To test handle_new_storage
config.storage.store_files.value = True

Expand Down