Merge branch 'devel'

[qcg-portal.git] / plgng / settings.py

diff --git a/plgng/settings.py b/plgng/settings.py
index 34b5c84..70576ac 100644 (file)
--- a/plgng/settings.py
+++ b/plgng/settings.py
@@ -6,6 +6,15 @@ SECRET_KEY = 'x%_rlnhibsxum1m5o_c5ac@p0nw+1r0&#k!v3+52)s(d=2$5y&'
 DEBUG = True
 TEMPLATE_DEBUG = True
 
+PROXY_FILE = os.path.join(BASE_DIR, '../proxy')
+
+
+INSTALLED_APPS += (
+    'sslserver',
+    'debug_toolbar'
+)
+
+
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
@@ -14,4 +23,6 @@ DATABASES = {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
-}
\ No newline at end of file
+}
+
+DEBUG_TOOLBAR_CONFIG = {'JQUERY_URL': '/static/qcg/jquery/jquery.min.js'}