ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 09:58:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'alias'

Browse Source 
# Conflicts:
#   note_kfet/settings/base.py
#   note_kfet/urls.py
This commit is contained in:
Pierre-antoine Comby
2020-03-06 21:49:46 +01:00
parent deb19e45c1 0193a4d898
commit ab8888a085
7 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
note_kfet/settings/base.py
View File

@ -55,6 +55,9 @@ INSTALLED_APPS = [
# Autocomplete
'dal',
'dal_select2',
# CAS
'cas_server',
'cas',
# Note apps
'activity',
@ -76,6 +79,7 @@ MIDDLEWARE = [
'django.middleware.locale.LocaleMiddleware',
'django.contrib.sites.middleware.CurrentSiteMiddleware',
'note_kfet.middlewares.TurbolinksMiddleware',
'cas.middleware.CASMiddleware',
]
ROOT_URLCONF = 'note_kfet.urls'
@ -129,6 +133,7 @@ PASSWORD_HASHERS = [
AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend', # this is default
'guardian.backends.ObjectPermissionBackend',
'cas.backends.CASBackend',
)
REST_FRAMEWORK = {
@ -195,3 +200,9 @@ MEDIA_URL='/media/'
# Profile Picture Settings
PIC_WIDTH = 200
PIC_RATIO = 1
# CAS Settings
CAS_AUTO_CREATE_USER = False
CAS_LOGO_URL = "/static/img/Saperlistpopette.png"
CAS_FAVICON_URL = "/static/favicon/favicon-32x32.png"

4
note_kfet/settings/development.py
View File

@ -48,3 +48,7 @@ CSRF_COOKIE_SECURE = False
CSRF_COOKIE_HTTPONLY = False
X_FRAME_OPTIONS = 'DENY'
SESSION_COOKIE_AGE = 60 * 60 * 3
# CAS Client settings
# Can be modified in secrets.py
CAS_SERVER_URL = "https://note.comby.xyz/cas/"

3
note_kfet/settings/production.py
View File

@ -47,3 +47,6 @@ CSRF_COOKIE_SECURE = False
CSRF_COOKIE_HTTPONLY = False
X_FRAME_OPTIONS = 'DENY'
SESSION_COOKIE_AGE = 60 * 60 * 3
# CAS Client settings
CAS_SERVER_URL = "https://note.crans.org/cas/"