Skip to content

Commit

Permalink
backported to support django 1.2 for app engine
Browse files Browse the repository at this point in the history
  • Loading branch information
trey0 committed May 29, 2012
1 parent 16badc8 commit 6194568
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions management/siteRequirements.txt
Expand Up @@ -10,3 +10,5 @@
# This is a place to specify any Python dependencies your site has that
# are not already specified in the requirements.txt file of one of your
# apps.

django-staticfiles
10 changes: 8 additions & 2 deletions siteSettings.py
Expand Up @@ -20,6 +20,7 @@
TEMPLATE_DEBUG = DEBUG
import os
import sys
from django.conf import global_settings
#APP = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
#PROJ_ROOT = os.path.abspath(os.path.dirname(__file__))
PROJ_ROOT = os.path.abspath(os.path.dirname(__file__))
Expand Down Expand Up @@ -108,9 +109,13 @@
'django.middleware.common.CommonMiddleware',
#'django.contrib.sessions.middleware.SessionMiddleware',
#'django.contrib.auth.middleware.AuthenticationMiddleware',
#'geocamUtil.middleware.SecurityMiddleware',
'geocamUtil.middleware.SecurityMiddleware',
)

TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
'geocamUtil.context_processors.static',
)

ROOT_URLCONF = 'urls'

TEMPLATE_DIRS = (
Expand All @@ -129,12 +134,13 @@
'geocamFolder',
'geocamUtil',

'staticfiles',

'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.staticfiles',
)

GEOCAM_UTIL_SECURITY_ENABLED = False # not USING_DJANGO_DEV_SERVER
Expand Down

0 comments on commit 6194568

Please sign in to comment.