Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Database Url check, force mailman to start, remove security settings in

Browse Source 
django.

- -z Does not check properly if the DATABASE_URL is defined or not. It evaluates
   to True if it is not set or set to ''

- Remove SECURE_SSL_REDIRECT in the django settings because this deployment is
  meant to behind Nginx which decrypts SSL packets.

- Force mailman to start even with a lock. This _may_ not be the best idea but
  for now if everything is followed according to this guide.
This commit is contained in:
Abhilash Raj
2017-04-08 19:35:02 -07:00
parent aec4ef4e03
commit 701825c2a3
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/run.sh
View File

@@ -33,7 +33,7 @@ function wait_for_postgres () {
# #
# TODO: Check the database type and detect if it is up based on that. For now, # TODO: Check the database type and detect if it is up based on that. For now,
# assume that postgres is being used if DATABASE_URL is defined. # assume that postgres is being used if DATABASE_URL is defined.
if [[ -z "$DATABASES_URL" ]]; then if [[ ! -v "$DATABASES_URL" ]]; then
echo "DATABASE_URL is not defined. Using sqlite database..." echo "DATABASE_URL is not defined. Using sqlite database..."
export DATABASE_URL=sqlite:///mailman.db export DATABASE_URL=sqlite:///mailman.db
export DATABASE_TYPE='sqlite' export DATABASE_TYPE='sqlite'
@@ -128,7 +128,7 @@ function term_handler () {
trap 'kill ${!}; term_handler' SIGTERM trap 'kill ${!}; term_handler' SIGTERM
# Start the mailman server. Mailman will start the master runner and then exit. # Start the mailman server. Mailman will start the master runner and then exit.
mailman -C /config/mailman.cfg start & mailman -C /config/mailman.cfg start --force &
# wait forever. # wait forever.
while true while true

7
web/mailman-web/settings.py
View File

@@ -162,13 +162,6 @@ USE_X_FORWARDED_HOST = True
# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https') # SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https')
# Other security settings # Other security settings
SECURE_SSL_REDIRECT = True
# If you set SECURE_SSL_REDIRECT to True, make sure the SECURE_REDIRECT_EXEMPT
# contains at least this line:
SECURE_REDIRECT_EXEMPT = [
# Request from Mailman.
"archives/api/mailman/.*",
]
# SESSION_COOKIE_SECURE = True # SESSION_COOKIE_SECURE = True
# SECURE_CONTENT_TYPE_NOSNIFF = True # SECURE_CONTENT_TYPE_NOSNIFF = True
# SECURE_BROWSER_XSS_FILTER = True # SECURE_BROWSER_XSS_FILTER = True