fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrades
[cas.git]
/
src
/
cas
/
settings.py
diff --git
a/src/cas/settings.py
b/src/cas/settings.py
index
62725c7
..
e71c5d4
100644
(file)
--- a/
src/cas/settings.py
+++ b/
src/cas/settings.py
@@
-20,6
+20,8
@@
DATABASES = {
}
}
}
}
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
@@
-37,6
+39,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/')
@@
-83,13
+87,19
@@
LOCALE_PATHS = (
)
INSTALLED_APPS = (
)
INSTALLED_APPS = (
- 'accounts',
+ 'accounts.apps.AccountsConfig',
+ 'emails.apps.EmailsConfig',
+ 'ftp',
+ 'services.apps.ServicesConfig',
+ 'ssh_keys.apps.SshKeysConfig',
'cas_provider',
'django_gravatar',
'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.sessions',
'django.contrib.sites',
'django.contrib.admin',
@@
-116,6
+126,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 *