pull/109/head
mpeltriaux 3 years ago
parent a2d5c4ddaa
commit 850a3914fd

@ -12,6 +12,7 @@ services:
konova: konova:
external_links: external_links:
- postgis:db - postgis:db
- arnova-nginx-server:arnova
build: . build: .
container_name: "konova-docker" container_name: "konova-docker"
command: gunicorn konova.wsgi:application --bind 0.0.0.0:8000 command: gunicorn konova.wsgi:application --bind 0.0.0.0:8000
@ -30,11 +31,13 @@ services:
- POSTGRES_USER=konova - POSTGRES_USER=konova
- POSTGRES_HOST=db - POSTGRES_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
- SSO_HOST=arnova
# To provide a celery worker instance, we need to add the celery worker as an own service # To provide a celery worker instance, we need to add the celery worker as an own service
celery_worker: celery_worker:
external_links: external_links:
- postgis:db - postgis:db
- arnova-nginx-server:arnova
build: . build: .
container_name: "konova-worker-docker" container_name: "konova-worker-docker"
command: celery -A konova worker -l INFO command: celery -A konova worker -l INFO
@ -50,6 +53,7 @@ services:
- POSTGRES_USER=konova - POSTGRES_USER=konova
- POSTGRES_HOST=db - POSTGRES_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
- SSO_HOST=arnova
nginx: nginx:
build: ./nginx build: ./nginx

@ -55,7 +55,7 @@ PAGE_SIZE_MAX = 100
PAGE_DEFAULT = 1 PAGE_DEFAULT = 1
# SSO settings # SSO settings
SSO_SERVER_BASE = "http://127.0.0.1:8000/" SSO_SERVER_BASE = f"http://{os.environ.get('SSO_HOST')}/"
SSO_SERVER = f"{SSO_SERVER_BASE}sso/" SSO_SERVER = f"{SSO_SERVER_BASE}sso/"
SSO_PRIVATE_KEY = "QuziFeih7U8DZvQQ1riPv2MXz0ZABupHED9wjoqZAqeMQaqkqTfxJDRXgSIyASwJ" SSO_PRIVATE_KEY = "QuziFeih7U8DZvQQ1riPv2MXz0ZABupHED9wjoqZAqeMQaqkqTfxJDRXgSIyASwJ"
SSO_PUBLIC_KEY = "AGGK7E8eT5X5u2GD38ygGG3GpAefmIldJiiWW7gldRPqCG1CzmUfGdvPSGDbEY2n" SSO_PUBLIC_KEY = "AGGK7E8eT5X5u2GD38ygGG3GpAefmIldJiiWW7gldRPqCG1CzmUfGdvPSGDbEY2n"

@ -30,11 +30,12 @@ BASE_DIR = os.path.dirname(
SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+' SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+'
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False DEBUG = True
ALLOWED_HOSTS = [ ALLOWED_HOSTS = [
"127.0.0.1", "127.0.0.1",
"localhost", "localhost",
"konova",
] ]
# Authentication settings # Authentication settings

Loading…
Cancel
Save