Skip to content
Snippets Groups Projects
Commit a9003216 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'release' into 'master'

Release

See merge request !15
parents 4488f087 1ed9e39f
No related branches found
No related tags found
4 merge requests!39Dev nico,!18Acceptance,!17pre-deploy to acceptance,!15Release
Pipeline #9373 passed
...@@ -86,7 +86,7 @@ docker-deploy-release: ...@@ -86,7 +86,7 @@ docker-deploy-release:
- chmod 644 ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts
script: script:
- ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker pull "$CI_REGISTRY_IMAGE"" - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p atdb -f /opt/dockercompose/docker-compose-production-cd.yml up -d" - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p atdb -f /opt/dockercompose/atdb-ldv-compose/docker-compose-production-cd.yml up -d"
when: manual when: manual
only: only:
- release - release
\ No newline at end of file
...@@ -25,7 +25,7 @@ SECRET_KEY = 'cie-((m#n$br$6l53yash45*2^mwuux*2u)bad5(0flx@krnj9' ...@@ -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! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['REPLACE_WITH_HOST_IP', 'localhost', '127.0.0.1', '192.168.22.22'] ALLOWED_HOSTS = ['*']
CORS_ORIGIN_ALLOW_ALL = True CORS_ORIGIN_ALLOW_ALL = True
# Application definition # Application definition
......
...@@ -2,16 +2,10 @@ from atdb.settings.base import * ...@@ -2,16 +2,10 @@ from atdb.settings.base import *
import os import os
# Import production setting must remain False. # Import production setting must remain False.
DEBUG = True DEBUG = False
ALLOWED_HOSTS = ["*"] 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. # 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 # http://django-secure.readthedocs.io/en/latest/middleware.html#x-xss-protection-1-mode-block
SECURE_BROWSER_XSS_FILTER = True SECURE_BROWSER_XSS_FILTER = True
......
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 = []
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
<p class="footer"> Version 1.0.0 (11 feb 2021 - 16:15) <p class="footer"> Version 1.0.0 (12 feb 2021 - 11:00)
<script type="text/javascript"> <script type="text/javascript">
(function(seconds) { (function(seconds) {
var refresh, var refresh,
......
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