From a2efd02aad22a0b9b97d620075541fb5b6201792 Mon Sep 17 00:00:00 2001 From: Akama Date: Wed, 4 Sep 2013 19:40:51 -0500 Subject: [PATCH] quickly --- NightShade/settings.py | 26 +++++++++++--------------- NightShade/settings.pyc | Bin 3258 -> 3285 bytes 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/NightShade/settings.py b/NightShade/settings.py index d51b157..a8a7b14 100644 --- a/NightShade/settings.py +++ b/NightShade/settings.py @@ -1,4 +1,5 @@ import os +import dj_database_url # Django settings for NightShade project. @@ -14,25 +15,21 @@ MANAGERS = ADMINS DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'MyDatebase', # 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. - } - } - -DATABASES['default'] = dj_database_url.config() + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'mydatabase' + } + } + + +DATABASES['default'] = dj_database_url.config() + +SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PRONTO', 'https') # 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 = ['*'] -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -163,4 +160,3 @@ }, } } - diff --git a/NightShade/settings.pyc b/NightShade/settings.pyc index eec17520d1a04de4afe10d26930d0d7f943de4dd..03cd8a931569ccee7c29243054d54e4846c5f476 100644 GIT binary patch delta 358 zcmX|-J4!=Q5Qe{#kk|F*Wi%QSV|)e$u@OOy=n5<>6sD8RNz4_s5EN`u+!e@OguUss zb_0TY5G>t*Cn0f|`RBzy!^~Udt5S{sX1$Nk=2@Guq@6!;cK`ZZJ?&dVkR}A1LX)&~ zAIYE@x(4x351B%z5FhoCEH;MZMwlOA0nH-C5l*8yq=bcFhG2FQl(BP!W~efc=8?*{ z)ejc1u2dk5(Q)l6dVti>60(RMB6YNdETL7Tf!2`a$y~?%-!xjFj#4L#6Re<)(wK~0 zMURj*dWqo~y2+khN4JPBOxtV>-px0SY2V#;dfh?M`!@M)m+xHN-Pj%b XaC!R}dH$|>ijMtqJW+^6=f3^{yxBsb delta 364 zcmYjNOG?9F5dJ2qX_F>tYkf4P)@rrjqr`;-e1YKJh3;lqC)PwnL_v35^aPR%h*#)B z@CvRygA12lz`wzW!^}6seDh%D!+Z05{oApgkGrSm_?43KN6PMAp8S)c?1D=W69WR9 z5DRQU%HT4@2HS`eMlYLgzSSCAqU_V#0M`yn&9@o=D$tZ0#U^+jC3T+5LMjH=dM5w!5zd? zlQU!;VYCX_Ko}F0$|htBq4d%RI-|AmJAD