Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
e6b407aa
Commit
e6b407aa
authored
3 years ago
by
Fredrik Jonsson
Browse files
Options
Downloads
Patches
Plain Diff
Matomo settings are strings not bool, add missing defaults.
parent
1ff6a22c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hypha/settings/base.py
+7
-8
7 additions, 8 deletions
hypha/settings/base.py
with
7 additions
and
8 deletions
hypha/settings/base.py
+
7
−
8
View file @
e6b407aa
...
...
@@ -4,8 +4,8 @@ Django settings for hypha project.
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import
os
import
dj_database_url
import
dj_database_url
from
environs
import
Env
env
=
Env
()
...
...
@@ -19,7 +19,7 @@ APP_NAME = env.str('APP_NAME', 'hypha')
DEBUG
=
False
# SECRET_KEY is required
SECRET_KEY
=
env
.
str
(
"
SECRET_KEY
"
)
SECRET_KEY
=
env
.
str
(
'
SECRET_KEY
'
,
None
)
ALLOWED_HOSTS
=
env
.
list
(
'
ALLOWED_HOSTS
'
,
[])
...
...
@@ -191,7 +191,7 @@ WSGI_APPLICATION = 'hypha.wsgi.application'
DATABASES
=
{
'
default
'
:
dj_database_url
.
config
(
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', [])
# Automatic transition settings
TRANSITION_AFTER_REVIEWS
=
env
.
bool
(
'
TRANSITION_AFTER_REVIEWS
'
,
False
)
TRANSITION_AFTER_ASSIGNED
=
env
.
bool
(
'
TRANSITION_AFTER_ASSIGNED
'
,
False
)
...
...
@@ -554,8 +553,8 @@ MAILCHIMP_LIST_ID = env.str('MAILCHIMP_LIST_ID', None)
# Basic auth settings
if
env
.
bool
(
'
BASIC_AUTH_ENABLED
'
,
False
):
MIDDLEWARE
.
insert
(
0
,
'
baipw.middleware.BasicAuthIPWhitelistMiddleware
'
)
BASIC_AUTH_LOGIN
=
env
.
str
(
'
BASIC_AUTH_LOGIN
'
)
BASIC_AUTH_PASSWORD
=
env
.
str
(
'
BASIC_AUTH_PASSWORD
'
)
BASIC_AUTH_LOGIN
=
env
.
str
(
'
BASIC_AUTH_LOGIN
'
,
None
)
BASIC_AUTH_PASSWORD
=
env
.
str
(
'
BASIC_AUTH_PASSWORD
'
,
None
)
BASIC_AUTH_WHITELISTED_HTTP_HOSTS
=
env
.
list
(
'
BASIC_AUTH_WHITELISTED_HTTP_HOSTS
'
,
[])
BASIC_AUTH_WHITELISTED_IP_NETWORKS
=
env
.
list
(
'
BASIC_AUTH_WHITELISTED_IP_NETWORKS
'
,
[])
...
...
@@ -650,5 +649,5 @@ if env.str('AWS_STORAGE_BUCKET_NAME', None):
FILE_FORM_TEMP_STORAGE
=
PRIVATE_FILE_STORAGE
# Matomo tracking
MATOMO_URL
=
env
.
bool
(
'
MATOMO_URL
'
,
Fals
e
)
MATOMO_SITEID
=
env
.
bool
(
'
MATOMO_SITEID
'
,
Fals
e
)
MATOMO_URL
=
env
.
str
(
'
MATOMO_URL
'
,
Non
e
)
MATOMO_SITEID
=
env
.
str
(
'
MATOMO_SITEID
'
,
Non
e
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment