Upgrades.

[cas.git] / src / cas / settings.py

diff --git a/src/cas/settings.py b/src/cas/settings.py
index a4c4137..c54bc14 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__))


@@ -21,12 +20,14 @@ 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.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 # 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.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.

-TIME_ZONE = None
+TIME_ZONE = 'Europe/Warsaw'

 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html


@@ -38,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/')


@@ -84,26 +87,31 @@ LOCALE_PATHS = (
 )
 
 INSTALLED_APPS = (
 )
 
 INSTALLED_APPS = (

+    'accounts.apps.AccountsConfig',
+    'emails.apps.EmailsConfig',
+    'ftp',
+    '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_CLASSES = (
+MIDDLEWARE = (

     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',

     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )


@@ -118,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 Wolne Lektury'
+
+
+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 *