From 6cf94e796cdb7ff04fcd6069fe7ea16a1e0e3d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= <fmartin@bytepix.com>
Date: Wed, 22 May 2013 18:31:01 +0200
Subject: [PATCH] Fixed environment settings

---
 config/development/local_settings.py | 22 ++--------------------
 config/production/local_settings.py  | 23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/config/development/local_settings.py b/config/development/local_settings.py
index da02a42..ef16c9c 100644
--- a/config/development/local_settings.py
+++ b/config/development/local_settings.py
@@ -1,31 +1,13 @@
 LOCAL_SETTINGS = True
 from settings import *
-from os import environ
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': environ['DATABASE_NAME'],
-        'USER': environ['DATABASE_USER'],
-        'PASSWORD': environ['DATABASE_PASS'],
-        'HOST': environ['DATABASE_HOST'],
-        'PORT': environ['DATABASE_PORT'],
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'dev_ddbb.sqlite',
     }
 }
 
-ALLOWED_HOSTS = [
-    'minecraftcodex.com',
-    'www.minecraftcodex.com',
-    'localhost',
-]
-
-# Staticfiles
-STATIC_ROOT = 'static'
-STATIC_URL = '/static/'
-
-# Mediafiles
-MEDIA_ROOT = 'media'
-MEDIA_URL = '/media/'
diff --git a/config/production/local_settings.py b/config/production/local_settings.py
index 23ed9b2..da02a42 100644
--- a/config/production/local_settings.py
+++ b/config/production/local_settings.py
@@ -1,12 +1,31 @@
 LOCAL_SETTINGS = True
 from settings import *
+from os import environ
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'dev_ddbb.sqlite',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': environ['DATABASE_NAME'],
+        'USER': environ['DATABASE_USER'],
+        'PASSWORD': environ['DATABASE_PASS'],
+        'HOST': environ['DATABASE_HOST'],
+        'PORT': environ['DATABASE_PORT'],
     }
 }
+
+ALLOWED_HOSTS = [
+    'minecraftcodex.com',
+    'www.minecraftcodex.com',
+    'localhost',
+]
+
+# Staticfiles
+STATIC_ROOT = 'static'
+STATIC_URL = '/static/'
+
+# Mediafiles
+MEDIA_ROOT = 'media'
+MEDIA_URL = '/media/'