diff options
Diffstat (limited to 'greenbox/settings.py')
-rw-r--r-- | greenbox/settings.py | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/greenbox/settings.py b/greenbox/settings.py index a0096ed..939f396 100644 --- a/greenbox/settings.py +++ b/greenbox/settings.py | |||
@@ -1,20 +1,12 @@ | |||
1 | import os | 1 | import os |
2 | 2 | ||
3 | PROJECT_DIR = os.path.dirname(__file__) | 3 | PROJECT_DIR = os.path.abspath(os.path.dirname(__file__)) |
4 | PUBLIC_DIR = os.path.join(PROJECT_DIR, 'site_media') | 4 | PUBLIC_DIR = os.path.join(os.path.dirname(__file__), 'site_media') |
5 | 5 | ||
6 | SITE_ID = 1 | 6 | SITE_ID = 1 |
7 | USE_I18N = False | 7 | USE_I18N = False |
8 | DEBUG = True | 8 | TEMPLATE_DEBUG = DEBUG = True |
9 | TEMPLATE_DEBUG = DEBUG | ||
10 | |||
11 | PROJECT_DIR = os.path.abspath(os.path.dirname(__file__)) | ||
12 | |||
13 | ADMINS = ( | ||
14 | ('Mike Crute', 'mcrute@gmail.com'), | ||
15 | ) | ||
16 | 9 | ||
17 | MANAGERS = ADMINS | ||
18 | 10 | ||
19 | DATABASES = { | 11 | DATABASES = { |
20 | 'default': { | 12 | 'default': { |
@@ -27,10 +19,6 @@ TIME_ZONE = 'America/New_York' | |||
27 | LANGUAGE_CODE = 'en-us' | 19 | LANGUAGE_CODE = 'en-us' |
28 | ROOT_URLCONF = 'greenbox.urls' | 20 | ROOT_URLCONF = 'greenbox.urls' |
29 | 21 | ||
30 | |||
31 | MEDIA_ROOT = os.path.join(PUBLIC_DIR, 'media') | ||
32 | MEDIA_URL = '/site_media/media/' | ||
33 | |||
34 | STATIC_ROOT = os.path.join(PUBLIC_DIR, 'static') | 22 | STATIC_ROOT = os.path.join(PUBLIC_DIR, 'static') |
35 | STATIC_URL = '/site_media/static/' | 23 | STATIC_URL = '/site_media/static/' |
36 | 24 | ||
@@ -60,8 +48,3 @@ INSTALLED_APPS = ( | |||
60 | 'south', | 48 | 'south', |
61 | 'recipe', | 49 | 'recipe', |
62 | ) | 50 | ) |
63 | |||
64 | try: | ||
65 | from settings_local import * | ||
66 | except ImportError: | ||
67 | pass | ||