Skip to content
Snippets Groups Projects
Commit 370e2ef0 authored by Fanna Lautenbach's avatar Fanna Lautenbach
Browse files

Merge branch 'fix_remaining_dependencies' into 'main'

Fix remaining dependencies

See merge request !92
parents cccec4c5 4d150275
No related branches found
No related tags found
1 merge request!92Fix remaining dependencies
Pipeline #45236 passed
......@@ -32,7 +32,6 @@ services:
networks:
- ldv_network
depends_on:
- ldv-spec-db
- ldv-spec-cache
environment:
CELERY_BROKER_URL: amqp://guest@rabbitmq:5672
......@@ -58,13 +57,9 @@ services:
- "traefik.http.services.ldv-specification.loadbalancer.server.port=8000"
depends_on:
- ldv-spec-db
- ldv-spec-cache
environment:
CELERY_BROKER_URL: amqp://guest@rabbitmq:5672
env_file:
- $HOME/shared/ldvspec.env
restart: always
volumes:
ldv-spec-db:
\ No newline at end of file
......@@ -33,7 +33,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
## These are required for ASTRONauth
# These are required for ASTRONauth
'django.contrib.sites',
"astronauth", # it is important that astronauth is included before allauth
'allauth',
......@@ -141,7 +141,8 @@ REST_FRAMEWORK = {
}
# Recommended to use an environment variable to set the broker URL.
CELERY_BROKER_URL = os.environ.get("CELERY_BROKER_URL", "amqp://guest@localhost:5672")
CELERY_BROKER_URL = os.environ.get(
"CELERY_BROKER_URL", "amqp://guest@localhost:5672")
UWS_WORKERS = ['lofardata.workers.query.Echo']
VERSION_STR = 'Version 1.0.0 (Unknown)'
......@@ -167,7 +168,6 @@ SOCIALACCOUNT_PROVIDERS = {
SITE_ID = int(os.environ.get('SITE_ID', 1))
SOCIALACCOUNT_ADAPTER = "astronauth.socialaccount.adapter.SocialAccountAdapter"
LOGIN_REDIRECT_URL = os.environ.get('LOGIN_REDIRECT_URL', '/ldvspec/')
LOGOUT_REDIRECT_URL = os.environ.get('LOGOUT_REDIRECT_URL', '/ldvspec/')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment