Commit c075f439 authored by OSP's avatar OSP

Database settings not tracked

parent 6adba61b
......@@ -7,6 +7,7 @@
# project specific #
run.sh
local_settings.py
# Scribus autosave #
*.autosave
......
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.', # Add one of postgresql_psycopg2, mysql, sqlite3, oracle
'NAME': '',
'USER': '',
'PASSWORD': '',
'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
'PORT': '', # Set to empty string for default.
}
}
......@@ -9,18 +9,6 @@ ADMINS = (
MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
'NAME': '', # Or path to database file if using sqlite3.
# The following settings are not used with sqlite3:
'USER': '',
'PASSWORD': '',
'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
'PORT': '', # Set to empty string for default.
}
}
# Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
ALLOWED_HOSTS = []
......@@ -154,3 +142,12 @@ LOGGING = {
},
}
}
try:
LOCAL_SETTINGS
except NameError:
try:
from local_settings import *
except ImportError:
pass
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 to comment