rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Merge pull request #1089 from bcj/bcj/non-standard-ports

Browse source 
Allow BookWyrm Services on Non-Standard Ports
This commit is contained in:
Mouse Reeve 2021-05-18 11:28:16 -07:00 committed by GitHub
parent f508b4eb33 9302aa6ce4
commit 30a67a0221
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.dev.example
View file

@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres
MEDIA_ROOT=images/
POSTGRES_PORT=5432
POSTGRES_PASSWORD=securedbpassword123
POSTGRES_USER=fedireads
POSTGRES_DB=fedireads

1
.env.prod.example
View file

@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres
MEDIA_ROOT=images/
POSTGRES_PORT=5432
POSTGRES_PASSWORD=securedbpassword123
POSTGRES_USER=fedireads
POSTGRES_DB=fedireads

2
bookwyrm/settings.py
View file

@ -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),
},
}

14
docker-compose.yml
View file

@ -53,30 +53,26 @@ services:
- 8000:8000
redis_activity:
image: redis
command: redis-server --requirepass ${REDIS_ACTIVITY_PASSWORD} --appendonly yes
command: redis-server --requirepass ${REDIS_ACTIVITY_PASSWORD} --appendonly yes --port ${REDIS_ACTIVITY_PORT}
volumes:
- ./redis.conf:/etc/redis/redis.conf
- redis_activity_data:/data
env_file: .env
ports:
- 6378:6378
networks:
- main
restart: on-failure
volumes:
- redis_activity_data:/data
redis_broker:
image: redis
command: redis-server --requirepass ${REDIS_BROKER_PASSWORD} --appendonly yes
command: redis-server --requirepass ${REDIS_BROKER_PASSWORD} --appendonly yes --port ${REDIS_BROKER_PORT}
volumes:
- ./redis.conf:/etc/redis/redis.conf
- redis_broker_data:/data
env_file: .env
ports:
- 6379:6379
networks:
- main
restart: on-failure
volumes:
- redis_broker_data:/data
celery_worker:
env_file: .env
build: .
@ -93,7 +89,7 @@ services:
restart: on-failure
flower:
build: .
command: flower --port=8888 --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD}
command: flower --port=${FLOWER_PORT} --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD}
env_file: .env
environment:
- CELERY_BROKER_URL=${CELERY_BROKER}