Unifying settings for dev and prod

apache/settings.py-dp

-# Django settings for Nuages
-
-import os
-from account.settings import *
-from urlauth.settings import *
-
-# Turn off for production
-DEBUG = False
-TEMPLATE_DEBUG = DEBUG
-
-PROJECT_DIR = os.path.normpath(os.path.dirname(__file__))
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-MANAGERS = ADMINS
-DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
-SITE = 'http://nuages.domainepublic.net/'
-
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = '/home/chris/django/nuages/nuages.sqlite'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-# 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 = 'Europe/Brussels'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-LANGUAGES = (
-  ('fr', 'Francais'),
-  ('en', 'English'),
-)
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-# Change this for production
-MEDIA_ROOT = '/var/www/nuages/static/'
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/static/'
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'yt$kh#^*y6p4&7_+3940u4j(91abrdko7hvtwc*)1w8f29+p&9'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'request.middleware.RequestMiddleware',
-    'urlauth.middleware.AuthKeyMiddleware'
-)
-
-ROOT_URLCONF = 'urls'
-
-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.
-    os.path.join(PROJECT_DIR, 'templates'),
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.admindocs',
-    'sondage',
-    'request',
-    'urlauth',
-    'account'
-)
-
-LOGIN_URL = '/user/login/'
-LOGIN_REDIRECT_URL = '/'
-

settings.py

@@ -5,7 +5,7 @@ from account.settings import *
 from urlauth.settings import *
 
 # Turn off for production
-DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 PROJECT_DIR = os.path.normpath(os.path.dirname(__file__))
@@ -14,10 +14,12 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
-SITE = 'http://127.0.0.1:8000/' 
+SITE = 'http://nuages.domainepublic.net/'
+if DEBUG:
+    SITE = 'http://127.0.0.1:8000/'
 
 DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = 'nuages.sqlite'             # Or path to database file if using sqlite3.
+DATABASE_NAME = os.path.join(PROJECT_DIR, 'nuages.sqlite')  # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
@@ -39,7 +41,6 @@ LANGUAGES = (
   ('en', 'English'),
 )
 
-
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
@@ -49,7 +50,7 @@ USE_I18N = True
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 # Change this for production
-MEDIA_ROOT = os.path.join(PROJECT_DIR, 'static')
+MEDIA_ROOT = '/var/www/nuages/static/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -104,3 +105,4 @@ INSTALLED_APPS = (
 
 LOGIN_URL = '/user/login/'
 LOGIN_REDIRECT_URL = '/'
+