X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fplanetstack%2Fsettings.py;h=fc56262ef4f0afde58a001d3606f589009f1bc77;hb=bf1153a32d6f27291dd7a3238bc1a9451e9d6154;hp=8970c426cd67e837440abcb22bdb423ae48b2e28;hpb=732913407cc255ab864e39522585e1b98e654af1;p=plstackapi.git

diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index 8970c42..fc56262 100644
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -1,4 +1,6 @@
 # Django settings for planetstack project.
+from config import Config
+config = Config()
 
 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'.
-        '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:
-        '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.
     }
 }
@@ -129,8 +131,8 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'rest_framework',
     'django_extensions',
-    'core',
     'django_evolution',
+    'core',
 )
 
 # A sample logging configuration. The only tangible logging