Commit ef249bc8 by x

Split production settings.

parent 156fc6bc
...@@ -37,3 +37,5 @@ nosetests.xml ...@@ -37,3 +37,5 @@ nosetests.xml
# Other # Other
*.swp *.swp
*~ *~
local_settings.py
# Django settings for cloud project. # Django settings for cloud project.
DEBUG = True DEBUG = True
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
ADMINS = ( ADMINS = (
('Ory, Mate', 'maat@iit.bme.hu'), ('IK', 'cloud@iit.bme.hu'),
) )
MANAGERS = ADMINS MANAGERS = ADMINS
...@@ -113,12 +114,9 @@ INSTALLED_APPS = ( ...@@ -113,12 +114,9 @@ INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
# Uncomment the next line to enable the admin:
'django.contrib.admin', 'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
'django.contrib.admindocs', 'django.contrib.admindocs',
'one', 'one',
'school', 'school',
...@@ -128,7 +126,6 @@ INSTALLED_APPS = ( ...@@ -128,7 +126,6 @@ INSTALLED_APPS = (
'south', 'south',
'djcelery', 'djcelery',
'kombu.transport.django', 'kombu.transport.django',
#'django_bfm',
) )
# A sample logging configuration. The only tangible logging # A sample logging configuration. The only tangible logging
...@@ -136,7 +133,7 @@ INSTALLED_APPS = ( ...@@ -136,7 +133,7 @@ INSTALLED_APPS = (
# the site admins on every HTTP 500 error when DEBUG=False. # the site admins on every HTTP 500 error when DEBUG=False.
# See http://docs.djangoproject.com/en/dev/topics/logging for # See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration. # more details on how to customize your logging configuration.
from logging.handlers import SysLogHandler from logging.handlers import SysLogHandler
LOGGING = { LOGGING = {
'version': 1, 'version': 1,
...@@ -178,5 +175,9 @@ import djcelery ...@@ -178,5 +175,9 @@ import djcelery
djcelery.setup_loader() djcelery.setup_loader()
BROKER_URL = 'django://' BROKER_URL = 'django://'
try:
from cloud.local_settings import *
except:
pass
# vim: et sw=4 ai fenc=utf8 smarttab : # vim: et sw=4 ai fenc=utf8 smarttab :
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment