git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed DeploymentNetwork to Deployment, adjusted initial_json to include service...
[plstackapi.git]
/
planetstack
/
planetstack
/
settings.py
diff --git
a/planetstack/planetstack/settings.py
b/planetstack/planetstack/settings.py
index
8970c42
..
fc56262
100644
(file)
--- a/
planetstack/planetstack/settings.py
+++ b/
planetstack/planetstack/settings.py
@@
-1,4
+1,6
@@
# Django settings for planetstack project.
# Django settings for planetstack project.
+from config import Config
+config = Config()
DEBUG = True
TEMPLATE_DEBUG = DEBUG
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@
-12,11
+14,11
@@
MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME':
'planetstack'
, # Or path to database file if using sqlite3.
+ 'NAME':
config.db_name
, # Or path to database file if using sqlite3.
# The following settings are not used with sqlite3:
# The following settings are not used with sqlite3:
- 'USER':
'postgres'
,
- 'PASSWORD':
'admin'
,
- 'HOST':
'localhost'
, # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
+ 'USER':
config.db_user
,
+ 'PASSWORD':
config.db_password
,
+ 'HOST':
config.db_host
, # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
'PORT': '', # Set to empty string for default.
}
}
'PORT': '', # Set to empty string for default.
}
}
@@
-129,8
+131,8
@@
INSTALLED_APPS = (
'django.contrib.admindocs',
'rest_framework',
'django_extensions',
'django.contrib.admindocs',
'rest_framework',
'django_extensions',
- 'core',
'django_evolution',
'django_evolution',
+ 'core',
)
# A sample logging configuration. The only tangible logging
)
# A sample logging configuration. The only tangible logging