fix celery conf sample

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

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index fe091a1..335b2b1 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 = (


@@ -27,6 +28,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

+    'django.middleware.csrf.CsrfViewMiddleware',

     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',


@@ -36,11 +38,37 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',

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

-INSTALLED_APPS = [
+# These are the ones we should test.
+INSTALLED_APPS_OUR = [
+    'wolnelektury_core',
+    # our
+    'ajaxable',
+    'api',
+    'catalogue',
+    'chunks',
+    'dictionary',
+    'infopages',
+    'lesmianator',
+    'newtagging',
+    'opds',
+    'pdcounter',
+    'reporting',
+    'sponsors',
+    'stats',
+    'suggest',
+    'picture',
+    'social',
+    'waiter',
+    'search',
+    'oai',
+    ]
+
+INSTALLED_APPS_CONTRIB = [

     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',


@@ -48,7 +76,9 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

+    'django.contrib.staticfiles',

     'pagination',
     'pagination',

+    'pipeline',

     'piston',
     'piwik.django',
     #'rosetta',
     'piston',
     'piwik.django',
     #'rosetta',


@@ -56,7 +86,8 @@ INSTALLED_APPS = [
     'sorl.thumbnail',
     'djcelery',
     'djkombu',
     'sorl.thumbnail',
     'djcelery',
     'djkombu',

-    #    'django_nose',
+    'honeypot',
+    #'django_nose',

 
     #allauth stuff
     'emailconfirmation',
 
     #allauth stuff
     'emailconfirmation',


@@ -69,35 +100,13 @@ INSTALLED_APPS = [
     #'allauth.twitter',
 
     # included
     #'allauth.twitter',
 
     # included

-    'compress',

     'modeltranslation',
     'modeltranslation',

+    ]

 
 

-    # our
-    'wolnelektury_core',
-    'ajaxable',
-    'api',
-    'catalogue',
-    'chunks',
-    'dictionary',
-    'infopages',
-    'lesmianator',
-    #'lessons',
-    'newtagging',
-    'opds',
-    'pdcounter',
-    'reporting',
-    'sponsors',
-    'stats',
-    'suggest',
-    'picture',
-    'search',
-    'social',
-    'waiter',
-]
+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

-