fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use canonical organization e-mail in OIDC data.
[cas.git]
/
src
/
cas
/
settings.py
diff --git
a/src/cas/settings.py
b/src/cas/settings.py
index
1883595
..
ab10159
100644
(file)
--- a/
src/cas/settings.py
+++ b/
src/cas/settings.py
@@
-1,4
+1,3
@@
-# -*- coding: utf-8 -*-
from os import path
PROJECT_ROOT = path.realpath(path.dirname(__file__))
from os import path
PROJECT_ROOT = path.realpath(path.dirname(__file__))
@@
-38,6
+37,8
@@
SITE_ID = 1
# to load the internationalization machinery.
USE_I18N = True
# to load the internationalization machinery.
USE_I18N = True
+USE_TZ = True
+
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = path.join(PROJECT_ROOT, '../../media/')
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = path.join(PROJECT_ROOT, '../../media/')
@@
-84,18
+85,23
@@
LOCALE_PATHS = (
)
INSTALLED_APPS = (
)
INSTALLED_APPS = (
+ 'accounts.apps.AccountsConfig',
+ 'emails.apps.EmailsConfig',
+ 'services.apps.ServicesConfig',
+ 'ssh_keys.apps.SshKeysConfig',
+
+ 'cas_provider',
+ 'django_gravatar',
+ 'oidc_provider',
+
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.auth',
'django.contrib.contenttypes',
+ 'django.contrib.messages',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.staticfiles',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.staticfiles',
-
- 'cas_provider',
- 'django_gravatar',
-
- 'accounts',
)
MIDDLEWARE = (
)
MIDDLEWARE = (
@@
-117,6
+123,12
@@
SESSION_COOKIE_NAME = 'fnpcas'
GRAVATAR_DEFAULT_IMAGE = 'mm'
GRAVATAR_URL_PREFIX = 'https://www.gravatar.com/'
GRAVATAR_DEFAULT_IMAGE = 'mm'
GRAVATAR_URL_PREFIX = 'https://www.gravatar.com/'
+SITE_TITLE = 'Fundacja Nowoczesna Polska'
+
+
+OIDC_USERINFO = 'emails.oidc.userinfo'
+
+
# Import localsettings file, which may override settings defined here
try:
from .localsettings import *
# Import localsettings file, which may override settings defined here
try:
from .localsettings import *