File diff 770e2ca88dd3 → 6c94eb9e91ee
pinaxcon/settings.py
Show inline comments
...
 
@@ -9,13 +9,13 @@ BASE_DIR = PACKAGE_ROOT
 
DEBUG = bool(int(os.environ.get("DEBUG", "1")))
 

	
 
DATABASES = {
 
    "default": dj_database_url.config(default="postgres://localhost/pinaxcon")
 
    "default": {
 
        "ENGINE": "django.db.backends.sqlite3",
 
        "NAME": os.path.join(PROJECT_ROOT, "dev.db"),
 
    }
 
}
 

	
 
ALLOWED_HOSTS = [
 
    os.environ.get("GONDOR_INSTANCE_DOMAIN"),
 
    "conference.pinaxproject.com"
 
]
 
ALLOWED_HOSTS = []
 

	
 
# Local time zone for this installation. Choices can be found here:
 
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
...
 
@@ -153,9 +153,16 @@ INSTALLED_APPS = [
 
    "symposion.sponsorship",
 
    "symposion.teams",
 

	
 
    # Registrasion
 
    "registrasion",
 

	
 
    #admin - required by registrasion ??
 
    "nested_admin",
 

	
 
    # project
 
    "pinaxcon",
 
    "pinaxcon.proposals"
 
    "pinaxcon.proposals",
 
    "pinaxcon.registrasion",
 
]
 

	
 
# A sample logging configuration. The only tangible logging
...
 
@@ -212,3 +219,5 @@ PROPOSAL_FORMS = {
 
}
 
PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"
 
PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet"
 

	
 
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"