Fixed environment settings

This commit is contained in:
Felipe Martín 2013-05-22 18:31:01 +02:00
parent dce7273615
commit 6cf94e796c
2 changed files with 23 additions and 22 deletions

View File

@ -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/'

View File

@ -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/'