From 1ed9e39f85afd2a9ff374a639debf371921dcc80 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 12 Feb 2021 10:52:47 +0100
Subject: [PATCH] test release branch
---
atdb/atdb/settings/base.py | 2 +-
atdb/atdb/settings/docker_sdc.py | 8 +---
atdb/atdb/settings/prod.py | 40 -------------------
.../templates/taskdatabase/index.html | 2 +-
4 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644 atdb/atdb/settings/prod.py
diff --git a/atdb/atdb/settings/base.py b/atdb/atdb/settings/base.py
index 074497d2..547df94e 100644
--- a/atdb/atdb/settings/base.py
+++ b/atdb/atdb/settings/base.py
@@ -25,7 +25,7 @@ SECRET_KEY = 'cie-((m#n$br$6l53yash45*2^mwuux*2u)bad5(0flx@krnj9'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = ['REPLACE_WITH_HOST_IP', 'localhost', '127.0.0.1', '192.168.22.22']
+ALLOWED_HOSTS = ['*']
CORS_ORIGIN_ALLOW_ALL = True
# Application definition
diff --git a/atdb/atdb/settings/docker_sdc.py b/atdb/atdb/settings/docker_sdc.py
index d87365cc..bdb7cda5 100644
--- a/atdb/atdb/settings/docker_sdc.py
+++ b/atdb/atdb/settings/docker_sdc.py
@@ -2,16 +2,10 @@ from atdb.settings.base import *
import os
# Import production setting must remain False.
-DEBUG = True
+DEBUG = False
ALLOWED_HOSTS = ["*"]
-
-# True: Enables a header that disables the UA from 'clever' automatic mime type sniffing.
-# http://django-secure.readthedocs.io/en/latest/settings.html#secure-content-type-nosniff
-# https://stackoverflow.com/questions/18337630/what-is-x-content-type-options-nosniff
-SECURE_CONTENT_TYPE_NOSNIFF = True
-
# True: Enables a header that tells the UA to switch on the XSS filter.
# http://django-secure.readthedocs.io/en/latest/middleware.html#x-xss-protection-1-mode-block
SECURE_BROWSER_XSS_FILTER = True
diff --git a/atdb/atdb/settings/prod.py b/atdb/atdb/settings/prod.py
deleted file mode 100644
index cc28c1e5..00000000
--- a/atdb/atdb/settings/prod.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from atdb.settings.base import *
-
-# Import production setting must remain False.
-DEBUG = False
-
-ALLOWED_HOSTS = ["*"]
-
-
-# True: Enables a header that disables the UA from 'clever' automatic mime type sniffing.
-# http://django-secure.readthedocs.io/en/latest/settings.html#secure-content-type-nosniff
-# https://stackoverflow.com/questions/18337630/what-is-x-content-type-options-nosniff
-SECURE_CONTENT_TYPE_NOSNIFF = True
-
-# True: Enables a header that tells the UA to switch on the XSS filter.
-# http://django-secure.readthedocs.io/en/latest/middleware.html#x-xss-protection-1-mode-block
-SECURE_BROWSER_XSS_FILTER = True
-
-# Prevents the site from being deployed within a iframe.
-# This prevent click-jacking attacks.
-# See; https://docs.djangoproject.com/en/1.11/ref/clickjacking/
-X_FRAME_OPTIONS = 'DENY'
-#####################################################
-DATABASE_PASSWORD = os.environ['DATABASE_PASSWORD']
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'atdbldv',
- 'HOST': 'sdc-db.astron.nl',
- 'PORT': '5432',
- 'USER': 'atdb',
- 'PASSWORD': 'atdb_ldv_2021',
- },
-}
-
-# Password validation
-# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = []
-
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index b367dd3d..ce00b59c 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -44,7 +44,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
- <p class="footer"> Version 1.0.0 (12 feb 2021 - 08:00)
+ <p class="footer"> Version 1.0.0 (12 feb 2021 - 11:00)
<script type="text/javascript">
(function(seconds) {
var refresh,
--
GitLab