From 5ffa6e5851c7597d02eaca56805c21f8d8bbb01c Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 3 Jul 2020 10:26:37 +0200
Subject: [PATCH] change configuration to esap.py

---
 esap/Dockerfile               | 1 +
 esap/esap/settings/docker.py  | 2 +-
 esap/esap/settings/statics.py | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/esap/Dockerfile b/esap/Dockerfile
index 6f9e91fc..7a501fb4 100644
--- a/esap/Dockerfile
+++ b/esap/Dockerfile
@@ -10,6 +10,7 @@ RUN pip install --upgrade pip  "cython==0.29.14"
 RUN pip install cryptography
 RUN pip install -r requirements/prod.txt
 RUN exec python manage.py collectstatic --settings=esap.settings.statics --no-input
+
 CMD exec gunicorn esap.wsgi_docker:application --bind 0.0.0.0:8000 --workers 3
 
 # build the image like this:
diff --git a/esap/esap/settings/docker.py b/esap/esap/settings/docker.py
index 49b5d503..95eca6c1 100644
--- a/esap/esap/settings/docker.py
+++ b/esap/esap/settings/docker.py
@@ -40,4 +40,4 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 # configuration settings that can be requested through the REST API
 CONFIGURATION_DIR = os.path.join(BASE_DIR, 'configuration')
-CONFIGURATION_FILE = 'esap_default'
+CONFIGURATION_FILE = 'esap'
diff --git a/esap/esap/settings/statics.py b/esap/esap/settings/statics.py
index bed1f823..8504abe2 100644
--- a/esap/esap/settings/statics.py
+++ b/esap/esap/settings/statics.py
@@ -24,6 +24,3 @@ INSTALLED_APPS = [
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
-# configuration settings that can be requested through the REST API
-CONFIGURATION_DIR = os.path.join(BASE_DIR, 'configuration')
-CONFIGURATION_FILE = 'esap'
\ No newline at end of file
-- 
GitLab