Permalink
Browse files

Updated settings_default.py and wsgi.py after runing `django_admin.py…

… startproject` and comparing the generated files with this project.
  • Loading branch information...
1 parent 7116630 commit a4755ac6da75bc6ab0a921b787e8542e914242bc @markotibold markotibold committed Mar 4, 2013
Showing with 9 additions and 4 deletions.
  1. +5 −4 startproject/settings_default.py
  2. +4 −0 startproject/wsgi.py
@@ -24,13 +24,14 @@
}
}
+# 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 = []
+
# 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.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
+# In a Windows environment this must be set to your system time zone.
TIME_ZONE = 'America/Chicago'
# Language code for this installation. All choices can be found here:
@@ -15,6 +15,10 @@
"""
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"] = "startproject.settings"
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "startproject.settings")
# This application object is used by any WSGI server configured to use this

0 comments on commit a4755ac

Please sign in to comment.