3 files changed, 39 insertions, 22 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 @@
 import os
 
-PROJECT_DIR = os.path.dirname(__file__)
-PUBLIC_DIR = os.path.join(PROJECT_DIR, 'site_media')
+PROJECT_DIR = os.path.abspath(os.path.dirname(__file__))
+PUBLIC_DIR = os.path.join(os.path.dirname(__file__), 'site_media')
 
 SITE_ID = 1
 USE_I18N = False
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-PROJECT_DIR = os.path.abspath(os.path.dirname(__file__))
-
-ADMINS = (
-    ('Mike Crute', 'mcrute@gmail.com'),
-)
+TEMPLATE_DEBUG = DEBUG = True
 
-MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
@@ -27,10 +19,6 @@ TIME_ZONE = 'America/New_York'
 LANGUAGE_CODE = 'en-us'
 ROOT_URLCONF = 'greenbox.urls'
 
-
-MEDIA_ROOT = os.path.join(PUBLIC_DIR, 'media')
-MEDIA_URL = '/site_media/media/'
-
 STATIC_ROOT = os.path.join(PUBLIC_DIR, 'static')
 STATIC_URL = '/site_media/static/'
 
@@ -60,8 +48,3 @@ INSTALLED_APPS = (
     'south',
     'recipe',
 )
-
-try:
-    from settings_local import *
-except ImportError:
-    pass
diff --git a/greenbox/urls.py b/greenbox/urls.py
index fb38894..1e6b755 100644
--- a/greenbox/urls.py
+++ b/greenbox/urls.py
@@ -1,5 +1,7 @@
-from django.conf.urls.defaults import patterns, include, url
-from django.contrib import admin; admin.autodiscover()
+from django.conf.urls import patterns, include, url
+
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
diff --git a/greenbox/wsgi.py b/greenbox/wsgi.py
new file mode 100644
index 0000000..0e2d030
--- /dev/null
+++ b/greenbox/wsgi.py
@@ -0,0 +1,32 @@
+"""
+WSGI config for imd project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+
+# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
+# if running multiple sites in the same mod_wsgi process. To fix this, use
+# mod_wsgi daemon mode with each site in its own daemon process, or use
+# os.environ["DJANGO_SETTINGS_MODULE"] = "imd.settings"
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenbox.settings")
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)