Merge pull request #49 from mgorny/merged-settings

Move middleware & installed app settings to common.

3 files changed, 25 insertions, 49 deletions

diff --git a/okupy/settings/__init__.py b/okupy/settings/__init__.py
index 5322763..da2a240 100644
--- a/okupy/settings/__init__.py
+++ b/okupy/settings/__init__.py
@@ -135,3 +135,28 @@ DATABASES['ldap'] = {
 }
 
 DATABASE_ROUTERS = ['ldapdb.router.Router']
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    # Uncomment the next line for simple clickjacking protection:
+    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+INSTALLED_APPS = (
+    'compressor',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'okupy.accounts',
+)
+
+#Compressor settings
+COMPRESS_ENABLED = True
+COMPRESS_PARSER = 'compressor.parser.HtmlParser'
diff --git a/okupy/settings/development.py.sample b/okupy/settings/development.py.sample
index 3eac264..a11ea87 100644
--- a/okupy/settings/development.py.sample
+++ b/okupy/settings/development.py.sample
@@ -79,16 +79,6 @@ TEMPLATE_LOADERS = (
 #     'django.template.loaders.eggs.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
@@ -96,22 +86,8 @@ TEMPLATE_DIRS = (
     settings.PROJECT_ROOT + '/okupy/templates/'
 )
 
-INSTALLED_APPS = (
-    'compressor',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django_auth_ldap',
-    'okupy.accounts',
-    'okupy.tests',
-)
-
 EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
 EMAIL_FILE_PATH = '/tmp/okupy/mail'
 
 #Compressor settings
 COMPRESS_ENABLED = False
-COMPRESS_PARSER = 'compressor.parser.HtmlParser'
diff --git a/okupy/settings/production.py b/okupy/settings/production.py
index 2151274..e04aaf4 100644
--- a/okupy/settings/production.py
+++ b/okupy/settings/production.py
@@ -78,34 +78,9 @@ TEMPLATE_LOADERS = (
 #     'django.template.loaders.eggs.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     settings.PROJECT_ROOT + '/okupy/templates/'
 )
-
-INSTALLED_APPS = (
-    'compressor',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'okupy.accounts',
-)
-
-#Compressor Settings
-COMPRESS_ENABLED = True
-COMPRESS_PARSER = 'compressor.parser.HtmlParser'