pipeline bug

[wolnelektury.git] / wolnelektury / settings / __init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index e00d269..9224484 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -2,13 +2,14 @@
 # Django settings for wolnelektury project.
 from os import path
 
 # Django settings for wolnelektury project.
 from os import path
 

-from settings.basic import *
-from settings.auth import *
-from settings.cache import *
-from settings.celery import *
-from settings.custom import *
-from settings.locale import *
-from settings.static import *
+from .basic import *
+from .auth import *
+from .cache import *
+from .celery import *
+from .contrib import *
+from .custom import *
+from .locale import *
+from .static import *

 
 
 TEMPLATE_CONTEXT_PROCESSORS = (
 
 
 TEMPLATE_CONTEXT_PROCESSORS = (


@@ -19,60 +20,31 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'wolnelektury_core.context_processors.extra_settings',
     'search.context_processors.search_form',
     'django.core.context_processors.request',
     'wolnelektury_core.context_processors.extra_settings',
     'search.context_processors.search_form',

-    "allauth.context_processors.allauth",
-    "allauth.account.context_processors.account",

 )
 
 MIDDLEWARE_CLASSES = [
 )
 
 MIDDLEWARE_CLASSES = [

+    'django.middleware.csrf.CsrfViewMiddleware',
+    'ssify.middleware.SsiMiddleware',

     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',

+    'ssify.middleware.PrepareForCacheMiddleware',

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

-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',

     'pagination.middleware.PaginationMiddleware',
     'pagination.middleware.PaginationMiddleware',

-    'django.middleware.locale.LocaleMiddleware',
-    'piwik.django.middleware.PiwikMiddleware',
+    'ssify.middleware.LocaleMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',

-    'django.middleware.cache.FetchFromCacheMiddleware',

     'django.contrib.messages.middleware.MessageMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
+    'django.middleware.cache.FetchFromCacheMiddleware',

 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
 
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
 

-INSTALLED_APPS = [
+# These are the ones we should test.
+INSTALLED_APPS_OUR = [

     'wolnelektury_core',
     'wolnelektury_core',

-    # external
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.admindocs',
-    'pagination',
-    'piston',
-    'piwik.django',
-    #'rosetta',
-    'south',
-    'sorl.thumbnail',
-    'djcelery',
-    'djkombu',
-    #    'django_nose',
-
-    #allauth stuff
-    'emailconfirmation',
-    'uni_form',
-    'allauth',
-    'allauth.account',
-    'allauth.socialaccount',
-    'allauth.openid',
-    #'allauth.facebook',
-    #'allauth.twitter',
-
-    # included
-    'compress',
-    'modeltranslation',
-

     # our
     'ajaxable',
     'api',
     # our
     'ajaxable',
     'api',


@@ -81,7 +53,6 @@ INSTALLED_APPS = [
     'dictionary',
     'infopages',
     'lesmianator',
     'dictionary',
     'infopages',
     'lesmianator',

-    #'lessons',

     'newtagging',
     'opds',
     'pdcounter',
     'newtagging',
     'opds',
     'pdcounter',


@@ -90,13 +61,57 @@ INSTALLED_APPS = [
     'stats',
     'suggest',
     'picture',
     'stats',
     'suggest',
     'picture',

-    'search',

     'social',
     'social',

-]
+    'waiter',
+    'search',
+    'oai',
+    'funding',
+    'polls',
+    'libraries',
+    ]
+
+GETPAID_BACKENDS = (
+    'getpaid.backends.payu',
+)
+
+INSTALLED_APPS_CONTRIB = [
+    # Should be before django.contrib.admin
+    'modeltranslation',
+
+    # external
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.admindocs',
+    'django.contrib.staticfiles',
+    'pagination',
+    'pipeline',
+    'piston',
+    'piwik',
+    'sorl.thumbnail',
+    'kombu.transport.django',
+    'honeypot',
+    'fnpdjango',
+    'getpaid',
+    'getpaid.backends.payu',
+    'ssify',
+
+    #allauth stuff
+    'uni_form',
+    'allauth',
+    'allauth.account',
+    'allauth.socialaccount',
+    'allauth.socialaccount.providers.openid',
+    'allauth.socialaccount.providers.facebook',
+    #'allauth.socialaccount.providers.twitter',
+    ]
+
+INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB

 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try:

-    from localsettings import *
+    from wolnelektury.localsettings import *

 except ImportError:
     pass
 except ImportError:
     pass

-