Skip to content
Snippets Groups Projects
Commit e6b407aa authored by Fredrik Jonsson's avatar Fredrik Jonsson
Browse files

Matomo settings are strings not bool, add missing defaults.

parent 1ff6a22c
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,8 @@ Django settings for hypha project. ...@@ -4,8 +4,8 @@ Django settings for hypha project.
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os import os
import dj_database_url
import dj_database_url
from environs import Env from environs import Env
env = Env() env = Env()
...@@ -19,7 +19,7 @@ APP_NAME = env.str('APP_NAME', 'hypha') ...@@ -19,7 +19,7 @@ APP_NAME = env.str('APP_NAME', 'hypha')
DEBUG = False DEBUG = False
# SECRET_KEY is required # SECRET_KEY is required
SECRET_KEY = env.str("SECRET_KEY") SECRET_KEY = env.str('SECRET_KEY', None)
ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', []) ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', [])
...@@ -191,7 +191,7 @@ WSGI_APPLICATION = 'hypha.wsgi.application' ...@@ -191,7 +191,7 @@ WSGI_APPLICATION = 'hypha.wsgi.application'
DATABASES = { DATABASES = {
'default': dj_database_url.config( 'default': dj_database_url.config(
conn_max_age=600, conn_max_age=600,
default=f"postgres:///{APP_NAME}" default=f'postgres:///{APP_NAME}'
) )
} }
...@@ -511,7 +511,6 @@ SLACK_TYPE_COMMENTS = env.list('SLACK_TYPE_COMMENTS', []) ...@@ -511,7 +511,6 @@ SLACK_TYPE_COMMENTS = env.list('SLACK_TYPE_COMMENTS', [])
# Automatic transition settings # Automatic transition settings
TRANSITION_AFTER_REVIEWS = env.bool('TRANSITION_AFTER_REVIEWS', False) TRANSITION_AFTER_REVIEWS = env.bool('TRANSITION_AFTER_REVIEWS', False)
TRANSITION_AFTER_ASSIGNED = env.bool('TRANSITION_AFTER_ASSIGNED', False) TRANSITION_AFTER_ASSIGNED = env.bool('TRANSITION_AFTER_ASSIGNED', False)
...@@ -554,8 +553,8 @@ MAILCHIMP_LIST_ID = env.str('MAILCHIMP_LIST_ID', None) ...@@ -554,8 +553,8 @@ MAILCHIMP_LIST_ID = env.str('MAILCHIMP_LIST_ID', None)
# Basic auth settings # Basic auth settings
if env.bool('BASIC_AUTH_ENABLED', False): if env.bool('BASIC_AUTH_ENABLED', False):
MIDDLEWARE.insert(0, 'baipw.middleware.BasicAuthIPWhitelistMiddleware') MIDDLEWARE.insert(0, 'baipw.middleware.BasicAuthIPWhitelistMiddleware')
BASIC_AUTH_LOGIN = env.str('BASIC_AUTH_LOGIN') BASIC_AUTH_LOGIN = env.str('BASIC_AUTH_LOGIN', None)
BASIC_AUTH_PASSWORD = env.str('BASIC_AUTH_PASSWORD') BASIC_AUTH_PASSWORD = env.str('BASIC_AUTH_PASSWORD', None)
BASIC_AUTH_WHITELISTED_HTTP_HOSTS = env.list('BASIC_AUTH_WHITELISTED_HTTP_HOSTS', []) BASIC_AUTH_WHITELISTED_HTTP_HOSTS = env.list('BASIC_AUTH_WHITELISTED_HTTP_HOSTS', [])
BASIC_AUTH_WHITELISTED_IP_NETWORKS = env.list('BASIC_AUTH_WHITELISTED_IP_NETWORKS', []) BASIC_AUTH_WHITELISTED_IP_NETWORKS = env.list('BASIC_AUTH_WHITELISTED_IP_NETWORKS', [])
...@@ -650,5 +649,5 @@ if env.str('AWS_STORAGE_BUCKET_NAME', None): ...@@ -650,5 +649,5 @@ if env.str('AWS_STORAGE_BUCKET_NAME', None):
FILE_FORM_TEMP_STORAGE = PRIVATE_FILE_STORAGE FILE_FORM_TEMP_STORAGE = PRIVATE_FILE_STORAGE
# Matomo tracking # Matomo tracking
MATOMO_URL = env.bool('MATOMO_URL', False) MATOMO_URL = env.str('MATOMO_URL', None)
MATOMO_SITEID = env.bool('MATOMO_SITEID', False) MATOMO_SITEID = env.str('MATOMO_SITEID', None)
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