summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-04-17 01:04:38 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-04-17 01:04:38 +0200
commitec38fbb14ddb13c58c0d5b6f36454d68336caf18 (patch)
tree09ff5f2cc9a5daa53de049aa969f58e801ac0f2c
parent03aa94962e9bba881c98df96ad07d3f6d7dcc5ee (diff)
downloadChimère - projet de référence-ec38fbb14ddb13c58c0d5b6f36454d68336caf18.tar.bz2
Chimère - projet de référence-ec38fbb14ddb13c58c0d5b6f36454d68336caf18.zip
settings.py reorganization
-rw-r--r--settings.py20
1 files changed, 3 insertions, 17 deletions
diff --git a/settings.py b/settings.py
index bed2540..8bbf3b4 100644
--- a/settings.py
+++ b/settings.py
@@ -5,6 +5,9 @@
import os
+DEBUG = False
+TEMPLATE_DEBUG = DEBUG
+
# Django settings for chimere project.
PROJECT_NAME = u'Chimère'
ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/"
@@ -78,9 +81,6 @@ CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL
CHIMERE_OSM_USER = 'test'
CHIMERE_OSM_PASSWORD = 'test'
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
)
@@ -102,11 +102,6 @@ DATABASES = {
import djcelery
djcelery.setup_loader()
BROKER_URL = 'django://'
-#BROKER_HOST = "localhost"
-#BROKER_PORT = 5672
-#BROKER_USER = "guest"
-#BROKER_PASSWORD = "guest"
-#BROKER_VHOST = "/"
# Local time zone for this installation. Choices can be found here:
# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
@@ -249,15 +244,6 @@ LOGGING = {'version': 1,
},
}
-TEMPLATE_CONTEXT_PROCESSORS = (
- 'django.core.context_processors.debug',
- 'django.core.context_processors.i18n',
- 'django.core.context_processors.media',
- 'django.core.context_processors.static',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
-)
-
try:
from local_settings import *
except ImportError, e: