From 213a9508d81b11bad8483e8e6e3e4facbfcad5d5 Mon Sep 17 00:00:00 2001 From: bcj Date: Mon, 17 May 2021 00:03:11 -0500 Subject: [PATCH 1/4] Don't hardcode postres port in bookwyrm.settings Have bookwyrm.settings check for an alternative postgres port. --- .env.prod.example | 1 + bookwyrm/settings.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.prod.example b/.env.prod.example index ac9fe70f8..a82499a32 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres MEDIA_ROOT=images/ +POSTGRES_PORT=5432 POSTGRES_PASSWORD=securedbpassword123 POSTGRES_USER=fedireads POSTGRES_DB=fedireads diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 45d8cb9d6..d694e33fd 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -118,7 +118,7 @@ BOOKWYRM_DBS = { "USER": env("POSTGRES_USER", "fedireads"), "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"), "HOST": env("POSTGRES_HOST", ""), - "PORT": 5432, + "PORT": env("POSTGRES_PORT", 5432), }, } From 24152c01291902a7f73de9112722d34cf0095ee5 Mon Sep 17 00:00:00 2001 From: bcj Date: Mon, 17 May 2021 00:03:51 -0500 Subject: [PATCH 2/4] Read flower port from .env --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9324b224b..80a85bcc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -76,7 +76,7 @@ services: restart: on-failure flower: build: . - command: flower --port=8888 + command: flower --port=${FLOWER_PORT} env_file: .env environment: - CELERY_BROKER_URL=${CELERY_BROKER} From 76ba116d2f2e0cb80af003afa431fee0d866020c Mon Sep 17 00:00:00 2001 From: bcj Date: Mon, 17 May 2021 00:07:59 -0500 Subject: [PATCH 3/4] Remove the redis_activity ports listing It is misleading, it isn't binding to that port --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 80a85bcc0..18f836502 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,8 +42,6 @@ services: image: redis command: ["redis-server", "--appendonly", "yes"] env_file: .env - ports: - - 6378:6378 networks: - main restart: on-failure From 1b8e1f8a907e7187dcb26001f98950991c4f56ce Mon Sep 17 00:00:00 2001 From: bcj Date: Tue, 18 May 2021 13:21:19 -0500 Subject: [PATCH 4/4] Add POSTGRES_PORT to .env.dev --- .env.dev.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.dev.example b/.env.dev.example index 538d1611d..2f24378c6 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres MEDIA_ROOT=images/ +POSTGRES_PORT=5432 POSTGRES_PASSWORD=fedireads POSTGRES_USER=fedireads POSTGRES_DB=fedireads