From f0ac9cae6a2415dd0ddf1f1e4e21092fcfea9169 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Wed, 21 Mar 2012 10:45:32 -0400
Subject: [PATCH 01/39] remove some outdated comments

---
 settings2/common.py | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/settings2/common.py b/settings2/common.py
index 5d5dffb084..4614beaa03 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -2,12 +2,12 @@
 This is the common settings file, intended to set sane defaults. If you have a
 piece of configuration that's dependent on a set of feature flags being set,
 then create a function that returns the calculated value based on the value of
-MITX_FEATURES[...]. That classes that extend this one can change the feature
+MITX_FEATURES[...]. Modules that extend this one can change the feature
 configuration in an environment specific config file and re-calculate those
 values.
 
 We should make a method that calls all these config methods so that you just 
-make one call at the end of your site-specific dev file and it reset all the
+make one call at the end of your site-specific dev file to reset all the
 dependent variables (like INSTALLED_APPS) for you.
 
 TODO:
@@ -39,21 +39,21 @@ MITX_FEATURES = {
     'SAMPLE' : False
 }
 
+# Used for A/B testing
+DEFAULT_GROUPS = []
+
+# If this is true, random scores will be generated for the purpose of debugging the profile graphs
+GENERATE_PROFILE_SCORES = False
+
 ############################# SET PATH INFORMATION #############################
 PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /mitxweb
 ENV_ROOT = PROJECT_ROOT.dirname() # virtualenv dir /mitxweb is in
-#ASKBOT_ROOT = ENV_ROOT / "3rdparty" / "askbot-devel"
 ASKBOT_ROOT = ENV_ROOT / "askbot-devel"
-#COURSES_ROOT = ENV_ROOT / "courses"
 COURSES_ROOT = ENV_ROOT / "data"
 
-# FIXME: code shouldn't expect trailing "/"
 # FIXME: To support multiple courses, we should walk the courses dir at startup
-#DATA_DIR = COURSES_ROOT / "6002x" / ""
 DATA_DIR = COURSES_ROOT
 
-#print DATA_DIR, COURSES_ROOT, ASKBOT_ROOT, ENV_ROOT, PROJECT_ROOT
-
 sys.path.append(ENV_ROOT)
 sys.path.append(ASKBOT_ROOT)
 sys.path.append(ASKBOT_ROOT / "askbot" / "deps")
@@ -65,10 +65,11 @@ sys.path.append(PROJECT_ROOT / 'lib')
 MAKO_MODULE_DIR = tempfile.mkdtemp('mako')
 MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['course'] = [DATA_DIR]
-MAKO_TEMPLATES['sections'] = [DATA_DIR+'/sections']
-MAKO_TEMPLATES['custom_tags'] = [DATA_DIR+'/custom_tags']
-MAKO_TEMPLATES['main'] = [ENV_ROOT+'/templates/']
+MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
+MAKO_TEMPLATES['custom_tags'] = [DATA_DIR / 'custom_tags']
+MAKO_TEMPLATES['main'] = [ENV_ROOT / 'templates/']
 
+# FIXME: We're not checking this out in this location yet
 TEXTBOOK_DIR = ENV_ROOT / "books" / "circuits_agarwal_lang"
 
 # FIXME ???????? -- 
@@ -87,9 +88,7 @@ STATIC_GRAB = False
 DEV_CONTENT = True
 
 # FIXME: Should we be doing this truncation?
-TRACK_MAX_EVENT = 1000 
-
-GENERATE_PROFILE_SCORES = False
+TRACK_MAX_EVENT = 5000 
 
 ############################### DJANGO BUILT-INS ###############################
 # Change DEBUG/TEMPLATE_DEBUG in your environment settings files, not here
@@ -101,7 +100,6 @@ SITE_ID = 1
 SITE_NAME = "localhost:8000"
 CSRF_COOKIE_DOMAIN = '127.0.0.1'
 HTTPS = 'on'
-#ROOT_URLCONF = 'mitxweb.urls'
 ROOT_URLCONF = 'mitx.urls'
 
 # Email
@@ -119,7 +117,7 @@ ADMIN_MEDIA_PREFIX = '/static/admin/'
 STATIC_ROOT = ENV_ROOT / "staticfiles" # FIXME: Should this and uploads be moved out of the repo?
 
 # FIXME: We should iterate through the courses we have, adding the static 
-#        contents for each of them.
+#        contents for each of them. (Right now we just use symlinks.)
 STATICFILES_DIRS = (
     # FIXME: Need to add entries for book, data/images, etc.
 #    PROJECT_ROOT / "static",
@@ -131,8 +129,6 @@ STATICFILES_DIRS = (
 #    ("book", TEXTBOOK_DIR)
 )
 
-print STATICFILES_DIRS
-
 # Templates
 TEMPLATE_DIRS = (
     ENV_ROOT / "templates",

From 2eedce0139bdd261228a1943193c3f66f8fc4f30 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Wed, 21 Mar 2012 17:54:58 -0400
Subject: [PATCH 02/39] Allow gunicorn_django to serve static files when
 DEBUG=True

---
 urls.py | 61 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/urls.py b/urls.py
index cf0132abab..bf7b79ff64 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,8 @@
 from django.conf import settings
 from django.conf.urls.defaults import patterns, include, url
 from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+
 import django.contrib.auth.views
 
 # Uncomment the next two lines to enable the admin:
@@ -33,37 +35,40 @@ urlpatterns = ('',
 )
 
 if settings.PERFSTATS:
-   urlpatterns=urlpatterns + (url(r'^reprofile$','perfstats.views.end_profile'),)
+    urlpatterns += (url(r'^reprofile$','perfstats.views.end_profile'),)
 
 if settings.COURSEWARE_ENABLED:
-    urlpatterns=urlpatterns + (url(r'^courseware/$', 'courseware.views.index', name="courseware"),
-    url(r'^wiki/', include('simplewiki.urls')),
-    url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/(?P<section>[^/]*)/$', 'courseware.views.index', name="courseware_section"),
-    url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index', name="courseware_chapter"),
-    url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index', name="courseware_course"),
-    url(r'^section/(?P<section>[^/]*)/$', 'courseware.views.render_section'),
-    url(r'^modx/(?P<module>[^/]*)/(?P<id>[^/]*)/(?P<dispatch>[^/]*)$', 'courseware.views.modx_dispatch'), #reset_problem'),
-    url(r'^profile$', 'courseware.views.profile'),
-    url(r'^profile/(?P<student_id>[^/]*)/$', 'courseware.views.profile'),
-    url(r'^change_setting$', 'student.views.change_setting'),
-    url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
-    url(r'^book/(?P<page>[^/]*)$', 'staticbook.views.index'), 
-    url(r'^book-shifted/(?P<page>[^/]*)$', 'staticbook.views.index_shifted'), 
-    url(r'^book*$', 'staticbook.views.index'), 
-    #    url(r'^course_info/$', 'student.views.courseinfo'),
-    #    url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
-    url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
-    url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
-    url(r'^calculate$', 'util.views.calculate'),
-)
+    urlpatterns += (
+        url(r'^courseware/$', 'courseware.views.index', name="courseware"),
+        url(r'^wiki/', include('simplewiki.urls')),
+        url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/(?P<section>[^/]*)/$', 'courseware.views.index', name="courseware_section"),
+        url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index', name="courseware_chapter"),
+        url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index', name="courseware_course"),
+        url(r'^section/(?P<section>[^/]*)/$', 'courseware.views.render_section'),
+        url(r'^modx/(?P<module>[^/]*)/(?P<id>[^/]*)/(?P<dispatch>[^/]*)$', 'courseware.views.modx_dispatch'), #reset_problem'),
+        url(r'^profile$', 'courseware.views.profile'),
+        url(r'^profile/(?P<student_id>[^/]*)/$', 'courseware.views.profile'),
+        url(r'^change_setting$', 'student.views.change_setting'),
+        url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
+        url(r'^book/(?P<page>[^/]*)$', 'staticbook.views.index'), 
+        url(r'^book-shifted/(?P<page>[^/]*)$', 'staticbook.views.index_shifted'), 
+        url(r'^book*$', 'staticbook.views.index'), 
+        #    url(r'^course_info/$', 'student.views.courseinfo'),
+        #    url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
+        url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
+        url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
+        url(r'^calculate$', 'util.views.calculate'),
+    )
 
 if settings.ASKBOT_ENABLED:
-   urlpatterns=urlpatterns + (url(r'^%s' % settings.ASKBOT_URL, include('askbot.urls')), \
-                                 url(r'^admin/', include(admin.site.urls)), \
-                                 url(r'^settings/', include('askbot.deps.livesettings.urls')), \
-                                 url(r'^followit/', include('followit.urls')), \
-#                                 url(r'^robots.txt$', include('robots.urls')),
+    urlpatterns += (url(r'^%s' % settings.ASKBOT_URL, include('askbot.urls')), \
+                    url(r'^admin/', include(admin.site.urls)), \
+                    url(r'^settings/', include('askbot.deps.livesettings.urls')), \
+                    url(r'^followit/', include('followit.urls')), \
+#                       url(r'^robots.txt$', include('robots.urls')),
                               )
-
-urlpatterns = patterns(*urlpatterns)
+if settings.DEBUG:
+    urlpatterns = patterns(*urlpatterns) + staticfiles_urlpatterns()
+else:
+    urlpatterns = patterns(*urlpatterns)
 

From aea72a62f78cf3c6e6761b91bf60f545bee9fe49 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 10:43:32 -0400
Subject: [PATCH 03/39] matching settings2 to old settings -- fix template
 lookup

---
 settings2/README.txt |  2 +-
 settings2/common.py  | 68 ++++++++++++++++++++++++++++++++------------
 settings2/dev.py     | 18 ++++++++++--
 3 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/settings2/README.txt b/settings2/README.txt
index 64a4c910df..671fded176 100644
--- a/settings2/README.txt
+++ b/settings2/README.txt
@@ -1,4 +1,4 @@
 Transitional for moving to new settings scheme. 
 
 To use: 
-django-admin runserver --settings=settings2.dev --pythonpath="."
+django-admin.py runserver --settings=settings2.dev --pythonpath="."
diff --git a/settings2/common.py b/settings2/common.py
index 4614beaa03..587905cc02 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -67,10 +67,12 @@ MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['course'] = [DATA_DIR]
 MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
 MAKO_TEMPLATES['custom_tags'] = [DATA_DIR / 'custom_tags']
-MAKO_TEMPLATES['main'] = [ENV_ROOT / 'templates/']
+MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', DATA_DIR / 'info']
 
 # FIXME: We're not checking this out in this location yet
-TEXTBOOK_DIR = ENV_ROOT / "books" / "circuits_agarwal_lang"
+# TEXTBOOK_DIR = ENV_ROOT / "books" / "circuits_agarwal_lang" # What it should eventually be
+TEXTBOOK_DIR = ENV_ROOT / "book_images"
+
 
 # FIXME ???????? -- 
 # We should have separate S3 staged URLs in case we need to make changes to 
@@ -88,7 +90,8 @@ STATIC_GRAB = False
 DEV_CONTENT = True
 
 # FIXME: Should we be doing this truncation?
-TRACK_MAX_EVENT = 5000 
+TRACK_MAX_EVENT = 10000 
+DEBUG_TRACK_LOG = False
 
 ############################### DJANGO BUILT-INS ###############################
 # Change DEBUG/TEMPLATE_DEBUG in your environment settings files, not here
@@ -119,23 +122,27 @@ STATIC_ROOT = ENV_ROOT / "staticfiles" # FIXME: Should this and uploads be moved
 # FIXME: We should iterate through the courses we have, adding the static 
 #        contents for each of them. (Right now we just use symlinks.)
 STATICFILES_DIRS = (
-    # FIXME: Need to add entries for book, data/images, etc.
-#    PROJECT_ROOT / "static",
-    ENV_ROOT / "static",
+# FIXME: Need to add entries for book, data/images, etc.
+    PROJECT_ROOT / "static",
     ASKBOT_ROOT / "askbot" / "skins",
+
+# Something like this will probably need to be enabled when we're really doing
+# multiple courses.
 #    ("circuits", DATA_DIR / "images"),
 #    ("handouts", DATA_DIR / "handouts"),
 #    ("subs", DATA_DIR / "subs"),
 #    ("book", TEXTBOOK_DIR)
 )
 
-# Templates
+# This is where Django Template lookup is defined. 
 TEMPLATE_DIRS = (
-    ENV_ROOT / "templates",
-#    PROJECT_ROOT / "templates",
-#    DATA_DIR / "problems",
+    PROJECT_ROOT / "templates",
+    DATA_DIR / "templates",
 )
 
+#'/Users/dave/Projects/mitx/mitx_all//data//templates', '/Users/dave/Projects/mitx/mitx_all//textbook/')
+#path(u'/Users/dave/Projects/mitx/mitx_all/data/problems'))
+
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'askbot.context.application_settings',
@@ -149,7 +156,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 MEDIA_ROOT = ENV_ROOT / "uploads"
 MEDIA_URL = "/discussion/upfiles/"
-FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
+FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
 FILE_UPLOAD_HANDLERS = (
     'django.core.files.uploadhandler.MemoryFileUploadHandler',
     'django.core.files.uploadhandler.TemporaryFileUploadHandler',
@@ -166,13 +173,27 @@ USE_L10N = True
 # logger.
 pid = os.getpid() # So we can log which process is creating the log
 hostname = platform.node().split(".")[0]
+
+LOG_DIR = "/tmp"
 SYSLOG_ADDRESS = ('syslog.m.i4x.org', 514)
+TRACKING_LOG_FILE = LOG_DIR + "/tracking_{0}.log".format(pid)
 
 handlers = ['console']
+
 # FIXME: re-enable syslogger later
 # if not DEBUG:
 #     handlers.append('syslogger')
 
+LOGGING_ENV = "dev" # override this in different environments
+
+# def register_loggers(syslog_addr, tracking_log_dir, logging_env):
+#     pid = os.getpid() # So we can log which process is creating the log
+#     hostname = platform.node().split(".")[0]
+#     SYSLOG_ADDRESS = ('syslog.m.i4x.org', 514)
+#     TRACKING_LOG_FILE = LOG_DIR + "/tracking_{0}.log".format(pid)
+# 
+#     handlers = ['console']
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': True,
@@ -181,7 +202,8 @@ LOGGING = {
             'format' : '%(asctime)s %(levelname)s %(process)d [%(name)s] %(filename)s:%(lineno)d - %(message)s',
         },
         'syslog_format' : {
-            'format' : '[%(name)s] %(levelname)s [' + hostname + ' %(process)d] [%(filename)s:%(lineno)d] - %(message)s',
+            'format' : '[%(name)s][env:' + LOGGING_ENV + '] %(levelname)s [' + \
+                        hostname + ' %(process)d] [%(filename)s:%(lineno)d] - %(message)s',
         },
         'raw' : {
             'format' : '%(message)s',
@@ -189,7 +211,7 @@ LOGGING = {
     },
     'handlers' : {
         'console' : {
-            'level' : 'DEBUG',
+            'level' : 'DEBUG' if DEBUG else 'INFO',
             'class' : 'logging.StreamHandler',
             'formatter' : 'standard',
             'stream' : sys.stdout,
@@ -206,6 +228,12 @@ LOGGING = {
             'address' : SYSLOG_ADDRESS,
             'formatter' : 'syslog_format',
         },
+        'tracking' : {
+            'level' : 'DEBUG',
+            'class' : 'logging.handlers.WatchedFileHandler',
+            'filename' : TRACKING_LOG_FILE,
+            'formatter' : 'raw',
+        },
         'mail_admins' : {
             'level': 'ERROR',
             'class': 'django.utils.log.AdminEmailHandler',
@@ -218,7 +246,7 @@ LOGGING = {
             'level' : 'INFO'
         },
         'tracking' : {
-            'handlers' : [] if DEBUG else ['syslogger'], # handlers,
+            'handlers' : ['tracking'],
             'level' : 'DEBUG',
             'propagate' : False,
         },
@@ -284,14 +312,16 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     'util.middleware.ExceptionLoggingMiddleware',
+    'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    #'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
     'mitxmako.middleware.MakoMiddleware',
-    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
+
     'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'askbot.middleware.forum_mode.ForumModeMiddleware',
     'askbot.middleware.cancel.CancelActionMiddleware',
@@ -299,10 +329,11 @@ MIDDLEWARE_CLASSES = (
     'askbot.middleware.view_log.ViewLogMiddleware',
     'askbot.middleware.spaceless.SpacelessMiddleware',
     # 'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
+    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 ################################### APPS #######################################
-def installed_apps():
+def installed_apps(extras=()):
     """If you want to get a different set of INSTALLED_APPS out of this, you'll
     have to set ASKBOT_ENABLED and COURSEWARE_ENABLED to True/False and call 
     this method. We can't just take these as params because other pieces of the
@@ -339,6 +370,7 @@ def installed_apps():
     
     return tuple(STANDARD_APPS + 
                  (COURSEWARE_APPS if COURSEWARE_ENABLED else []) +
-                 (ASKBOT_APPS if ASKBOT_ENABLED else []))
+                 (ASKBOT_APPS if ASKBOT_ENABLED else []) + 
+                 list(extras))
 
 INSTALLED_APPS = installed_apps()
diff --git a/settings2/dev.py b/settings2/dev.py
index 925f9ac02f..cf9f8d1873 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -17,7 +17,7 @@ DATABASES = {
 SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
 
 DEBUG = True
-TEMPLATE_DEBUG = False
+TEMPLATE_DEBUG = True
 
 # This is disabling ASKBOT, but not properly overwriting INSTALLED_APPS. ???
 # It's because our ASKBOT_ENABLED here is actually shadowing the real one.
@@ -25,4 +25,18 @@ TEMPLATE_DEBUG = False
 # ASKBOT_ENABLED = True
 # MITX_FEATURES['SAMPLE'] = True  # Switch to this system so we get around the shadowing
 #
-# INSTALLED_APPS = installed_apps()
+INSTALLED_APPS = installed_apps(extras=['debug_toolbar'])
+MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES
+
+DEBUG_TOOLBAR_PANELS = (
+   'debug_toolbar.panels.version.VersionDebugPanel',
+   'debug_toolbar.panels.timer.TimerDebugPanel',
+#  'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+   'debug_toolbar.panels.headers.HeaderDebugPanel',
+   'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+   'debug_toolbar.panels.sql.SQLDebugPanel',
+   'debug_toolbar.panels.signals.SignalDebugPanel',
+   'debug_toolbar.panels.logger.LoggingPanel',
+#   'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
+)
+

From e3e8edcf817ebd89c4922b9af3b9df3a1f709dc3 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 10:48:40 -0400
Subject: [PATCH 04/39] Update location of JS assets for local debugging (most
 envs use S3), remove old link to 3rdParty repo (which is no longer used)

---
 settings2/common.py | 2 +-
 static/lib          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 120000 static/lib

diff --git a/settings2/common.py b/settings2/common.py
index 587905cc02..556a8294cf 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -77,7 +77,7 @@ TEXTBOOK_DIR = ENV_ROOT / "book_images"
 # FIXME ???????? -- 
 # We should have separate S3 staged URLs in case we need to make changes to 
 # these assets and test them.
-LIB_URL = '/static/lib/'
+LIB_URL = '/static/js/'
 # LIB_URL = 'https://mitxstatic.s3.amazonaws.com/js/' # For AWS deploys
 
 # Dev machines shouldn't need the book
diff --git a/static/lib b/static/lib
deleted file mode 120000
index 834765babd..0000000000
--- a/static/lib
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdParty/static/js/
\ No newline at end of file

From 4bcfaed59823c36065db20f55c06516eaa1f463e Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 11:35:34 -0400
Subject: [PATCH 05/39] update settings2's askbot to reflect new karma limits

---
 settings2/askbotsettings.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/settings2/askbotsettings.py b/settings2/askbotsettings.py
index 8b04726a00..c81252d04f 100644
--- a/settings2/askbotsettings.py
+++ b/settings2/askbotsettings.py
@@ -1,4 +1,10 @@
-# askbot livesettings
+"""
+There are other askbot settings in common.py that covers things like where the
+templates are located, etc. This file is purely for askbot forum *behavior*.
+This means things like karma limits, the ability to post questions as wikis, 
+anonymous questions, etc.
+"""
+
 LIVESETTINGS_OPTIONS = {
     1: {
         'DB' : False,
@@ -88,9 +94,9 @@ LIVESETTINGS_OPTIONS = {
                 'MIN_TITLE_LENGTH' : 1,
                 'MIN_QUESTION_BODY_LENGTH' : 1,
                 'MIN_ANSWER_BODY_LENGTH' : 1,
-                'WIKI_ON' : True,
+                'WIKI_ON' : False,
                 'ALLOW_ASK_ANONYMOUSLY' : True,
-                'ALLOW_POSTING_BEFORE_LOGGING_IN' : True,
+                'ALLOW_POSTING_BEFORE_LOGGING_IN' : False,
                 'ALLOW_SWAPPING_QUESTION_WITH_ANSWER' : False,
                 'MAX_TAG_LENGTH' : 20,
                 'MIN_TITLE_LENGTH' : 1,
@@ -181,21 +187,21 @@ LIVESETTINGS_OPTIONS = {
             'MIN_REP' : {
                 'MIN_REP_TO_ACCEPT_OWN_ANSWER' : 1,
                 'MIN_REP_TO_ANSWER_OWN_QUESTION' : 1,
-                'MIN_REP_TO_CLOSE_OTHERS_QUESTIONS' : 100,
+                'MIN_REP_TO_CLOSE_OTHERS_QUESTIONS' : 1200,
                 'MIN_REP_TO_CLOSE_OWN_QUESTIONS' : 1,
-                'MIN_REP_TO_DELETE_OTHERS_COMMENTS' : 2000,
-                'MIN_REP_TO_DELETE_OTHERS_POSTS' : 5000,
-                'MIN_REP_TO_EDIT_OTHERS_POSTS' : 2000,
-                'MIN_REP_TO_EDIT_WIKI' : 1,
+                'MIN_REP_TO_DELETE_OTHERS_COMMENTS' : 5000,
+                'MIN_REP_TO_DELETE_OTHERS_POSTS' : 10000,
+                'MIN_REP_TO_EDIT_OTHERS_POSTS' : 5000,
+                'MIN_REP_TO_EDIT_WIKI' : 200,
                 'MIN_REP_TO_FLAG_OFFENSIVE' : 1,
                 'MIN_REP_TO_HAVE_STRONG_URL' : 250,
                 'MIN_REP_TO_LEAVE_COMMENTS' : 1,
-                'MIN_REP_TO_LOCK_POSTS' : 4000,
+                'MIN_REP_TO_LOCK_POSTS' : 10000,
                 'MIN_REP_TO_REOPEN_OWN_QUESTIONS' : 1,
-                'MIN_REP_TO_RETAG_OTHERS_QUESTIONS' : 1,
+                'MIN_REP_TO_RETAG_OTHERS_QUESTIONS' : 100,
                 'MIN_REP_TO_UPLOAD_FILES' : 1,
                 'MIN_REP_TO_VIEW_OFFENSIVE_FLAGS' : 2000,
-                'MIN_REP_TO_VOTE_DOWN' : 1,
+                'MIN_REP_TO_VOTE_DOWN' : 15,
                 'MIN_REP_TO_VOTE_UP' : 1,
             },
             'QA_SITE_SETTINGS' : {
@@ -275,7 +281,7 @@ LIVESETTINGS_OPTIONS = {
             'VOTE_RULES' : {
                 'MAX_VOTES_PER_USER_PER_DAY' : 30,
                 'MAX_FLAGS_PER_USER_PER_DAY' : 5,
-                'MIN_DAYS_FOR_STAFF_TO_ACCEPT_ANSWER' : 7,
+                'MIN_DAYS_FOR_STAFF_TO_ACCEPT_ANSWER' : 0,
                 'MIN_DAYS_TO_ANSWER_OWN_QUESTION' : 0,
                 'MIN_FLAGS_TO_DELETE_POST' : 5,
                 'MIN_FLAGS_TO_HIDE_POST' : 3,
@@ -284,4 +290,4 @@ LIVESETTINGS_OPTIONS = {
             },
         },
     },
-}
+}
\ No newline at end of file

From 18fb637f1b950866d3beaa7a71f800839b035fd0 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 11:36:40 -0400
Subject: [PATCH 06/39] remove redundancy between dev and devplus envs in
 config

---
 settings2/devplus.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/settings2/devplus.py b/settings2/devplus.py
index 9cc9a67779..16ca03c16f 100644
--- a/settings2/devplus.py
+++ b/settings2/devplus.py
@@ -1,11 +1,10 @@
 """
 This config file tries to mimic the production environment more closely than the
 normal dev.py. It assumes you're running a local instance of MySQL 5.1 and that
-you're running memcached.
+you're running memcached. You'll want to use this to test caching and database
+migrations.
 """
-from common import *
-
-CSRF_COOKIE_DOMAIN = 'localhost'
+from dev import *
 
 DATABASES = {
     'default': {
@@ -18,9 +17,6 @@ DATABASES = {
     }
 }
 
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
-
 CACHES = {
    'default': {
        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
@@ -28,8 +24,4 @@ CACHES = {
    }
 }
 
-
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
-
-DEBUG = True
-TEMPLATE_DEBUG = True
\ No newline at end of file

From 2ab562f792bae05c2fbfaa122d7b224bbab35162 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 11:37:49 -0400
Subject: [PATCH 07/39] moved template related config together, removed some
 cruft

---
 settings2/common.py | 50 ++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/settings2/common.py b/settings2/common.py
index 556a8294cf..d789fde8b8 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -61,7 +61,8 @@ sys.path.append(PROJECT_ROOT / 'djangoapps')
 sys.path.append(PROJECT_ROOT / 'lib')
 
 ################################## MITXWEB #####################################
-# This is where we stick our compiled template files
+# This is where we stick our compiled template files. Most of the app uses Mako
+# templates
 MAKO_MODULE_DIR = tempfile.mkdtemp('mako')
 MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['course'] = [DATA_DIR]
@@ -69,12 +70,28 @@ MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
 MAKO_TEMPLATES['custom_tags'] = [DATA_DIR / 'custom_tags']
 MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', DATA_DIR / 'info']
 
+# This is where Django Template lookup is defined. There are a few of these 
+# still left lying around.
+TEMPLATE_DIRS = (
+    PROJECT_ROOT / "templates",
+    DATA_DIR / "templates",
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.core.context_processors.request',
+    'askbot.context.application_settings',
+    #'django.core.context_processors.i18n',
+    'askbot.user_messages.context_processors.user_messages',#must be before auth
+    'django.core.context_processors.auth', #this is required for admin
+    'django.core.context_processors.csrf', #necessary for csrf protection
+)
+
+
 # FIXME: We're not checking this out in this location yet
 # TEXTBOOK_DIR = ENV_ROOT / "books" / "circuits_agarwal_lang" # What it should eventually be
 TEXTBOOK_DIR = ENV_ROOT / "book_images"
 
-
-# FIXME ???????? -- 
+# FIXME: 
 # We should have separate S3 staged URLs in case we need to make changes to 
 # these assets and test them.
 LIB_URL = '/static/js/'
@@ -84,7 +101,6 @@ LIB_URL = '/static/js/'
 # BOOK_URL = '/static/book/'
 BOOK_URL = 'https://mitxstatic.s3.amazonaws.com/book_images/' # For AWS deploys
 
-# FIXME ??????? What are these exactly?
 # Configuration option for when we want to grab server error pages
 STATIC_GRAB = False
 DEV_CONTENT = True
@@ -134,24 +150,6 @@ STATICFILES_DIRS = (
 #    ("book", TEXTBOOK_DIR)
 )
 
-# This is where Django Template lookup is defined. 
-TEMPLATE_DIRS = (
-    PROJECT_ROOT / "templates",
-    DATA_DIR / "templates",
-)
-
-#'/Users/dave/Projects/mitx/mitx_all//data//templates', '/Users/dave/Projects/mitx/mitx_all//textbook/')
-#path(u'/Users/dave/Projects/mitx/mitx_all/data/problems'))
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.request',
-    'askbot.context.application_settings',
-    #'django.core.context_processors.i18n',
-    'askbot.user_messages.context_processors.user_messages',#must be before auth
-    'django.core.context_processors.auth', #this is required for admin
-    'django.core.context_processors.csrf', #necessary for csrf protection
-)
-
 # Storage
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 MEDIA_ROOT = ENV_ROOT / "uploads"
@@ -186,14 +184,6 @@ handlers = ['console']
 
 LOGGING_ENV = "dev" # override this in different environments
 
-# def register_loggers(syslog_addr, tracking_log_dir, logging_env):
-#     pid = os.getpid() # So we can log which process is creating the log
-#     hostname = platform.node().split(".")[0]
-#     SYSLOG_ADDRESS = ('syslog.m.i4x.org', 514)
-#     TRACKING_LOG_FILE = LOG_DIR + "/tracking_{0}.log".format(pid)
-# 
-#     handlers = ['console']
-
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': True,

From e253ea25d50a5dedd080bab58be3108915b632ec Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 11:39:04 -0400
Subject: [PATCH 08/39] added dir structure assumptions to dev.py env config

---
 settings2/dev.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/settings2/dev.py b/settings2/dev.py
index cf9f8d1873..7d2759f39d 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -1,6 +1,11 @@
 """
 This config file runs the simplest dev environment using sqlite, and db-based
-sessions.
+sessions. Assumes structure:
+
+/envroot/
+        /db   # This is where it'll write the database file
+        /mitx # The location of this repo
+
 """
 from common import *
 
@@ -24,7 +29,7 @@ TEMPLATE_DEBUG = True
 # 
 # ASKBOT_ENABLED = True
 # MITX_FEATURES['SAMPLE'] = True  # Switch to this system so we get around the shadowing
-#
+
 INSTALLED_APPS = installed_apps(extras=['debug_toolbar'])
 MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES
 
@@ -39,4 +44,3 @@ DEBUG_TOOLBAR_PANELS = (
    'debug_toolbar.panels.logger.LoggingPanel',
 #   'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
 )
-

From 1a5abdf696a351284602202a4aa9cbc928984c07 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 13:21:06 -0400
Subject: [PATCH 09/39] move more dev specific config (uploads, dummy caching)
 into dev.py

---
 settings2/common.py  | 18 +++--------------
 settings2/dev.py     | 48 +++++++++++++++++++++++++++++++++++---------
 settings2/devplus.py |  6 ++++++
 3 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/settings2/common.py b/settings2/common.py
index d789fde8b8..3a4003d5cb 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -133,12 +133,11 @@ MANAGERS = ADMINS
 # Static content
 STATIC_URL = '/static/'
 ADMIN_MEDIA_PREFIX = '/static/admin/'
-STATIC_ROOT = ENV_ROOT / "staticfiles" # FIXME: Should this and uploads be moved out of the repo?
+STATIC_ROOT = ENV_ROOT / "staticfiles" # We don't run collectstatic -- this is to appease askbot checks
 
 # FIXME: We should iterate through the courses we have, adding the static 
 #        contents for each of them. (Right now we just use symlinks.)
 STATICFILES_DIRS = (
-# FIXME: Need to add entries for book, data/images, etc.
     PROJECT_ROOT / "static",
     ASKBOT_ROOT / "askbot" / "skins",
 
@@ -150,16 +149,6 @@ STATICFILES_DIRS = (
 #    ("book", TEXTBOOK_DIR)
 )
 
-# Storage
-DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-MEDIA_ROOT = ENV_ROOT / "uploads"
-MEDIA_URL = "/discussion/upfiles/"
-FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
-FILE_UPLOAD_HANDLERS = (
-    'django.core.files.uploadhandler.MemoryFileUploadHandler',
-    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
-)
-
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -323,7 +312,7 @@ MIDDLEWARE_CLASSES = (
 )
 
 ################################### APPS #######################################
-def installed_apps(extras=()):
+def installed_apps():
     """If you want to get a different set of INSTALLED_APPS out of this, you'll
     have to set ASKBOT_ENABLED and COURSEWARE_ENABLED to True/False and call 
     this method. We can't just take these as params because other pieces of the
@@ -360,7 +349,6 @@ def installed_apps(extras=()):
     
     return tuple(STANDARD_APPS + 
                  (COURSEWARE_APPS if COURSEWARE_ENABLED else []) +
-                 (ASKBOT_APPS if ASKBOT_ENABLED else []) + 
-                 list(extras))
+                 (ASKBOT_APPS if ASKBOT_ENABLED else []))
 
 INSTALLED_APPS = installed_apps()
diff --git a/settings2/dev.py b/settings2/dev.py
index 7d2759f39d..e932804bf6 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -9,7 +9,8 @@ sessions. Assumes structure:
 """
 from common import *
 
-CSRF_COOKIE_DOMAIN = 'localhost'
+DEBUG = True
+TEMPLATE_DEBUG = True
 
 DATABASES = {
     'default': {
@@ -18,20 +19,16 @@ DATABASES = {
     }
 }
 
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
-
-DEBUG = True
-TEMPLATE_DEBUG = True
-
 # This is disabling ASKBOT, but not properly overwriting INSTALLED_APPS. ???
 # It's because our ASKBOT_ENABLED here is actually shadowing the real one.
 # 
 # ASKBOT_ENABLED = True
 # MITX_FEATURES['SAMPLE'] = True  # Switch to this system so we get around the shadowing
 
-INSTALLED_APPS = installed_apps(extras=['debug_toolbar'])
-MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES
+# Add the debug toolbar...
+#INSTALLED_APPS += ('debug_toolbar',) 
+#MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES
+INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (
    'debug_toolbar.panels.version.VersionDebugPanel',
@@ -42,5 +39,36 @@ DEBUG_TOOLBAR_PANELS = (
    'debug_toolbar.panels.sql.SQLDebugPanel',
    'debug_toolbar.panels.signals.SignalDebugPanel',
    'debug_toolbar.panels.logger.LoggingPanel',
-#   'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
+#  'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
 )
+
+# Storage for uploaded files (askbot file uploads at the moment)
+DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+MEDIA_ROOT = ENV_ROOT / "uploads"
+MEDIA_URL = "/discussion/upfiles/"
+FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
+FILE_UPLOAD_HANDLERS = (
+    'django.core.files.uploadhandler.MemoryFileUploadHandler',
+    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
+)
+
+CACHES = {
+    # This is the cache used for most things. Askbot will not work without a 
+    # functioning cache -- it relies on caching to load its settings in places.
+    # In staging/prod envs, the sessions also live here.
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'mitx_loc_mem_cache'
+    },
+
+    # The general cache is what you get if you use our util.cache. It's used for
+    # things like caching the course.xml file for different A/B test groups.
+    # We set it to be a DummyCache to force reloading of course.xml in dev.
+    'general': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+        'KEY_PREFIX': 'general',
+    }
+}
+
+# Dummy secret key for dev
+SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
diff --git a/settings2/devplus.py b/settings2/devplus.py
index 16ca03c16f..002fef4d0c 100644
--- a/settings2/devplus.py
+++ b/settings2/devplus.py
@@ -22,6 +22,12 @@ CACHES = {
        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
        'LOCATION': '127.0.0.1:11211',
    }
+   'general': {
+       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+       'LOCATION': '127.0.0.1:11211',
+       'KEY_PREFIX' : 'general',
+       'VERSION' : 3,
+   }
 }
 
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'

From db9e5282b2f4f355df2d98aacf597dc1b96dc35e Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 13:27:02 -0400
Subject: [PATCH 10/39] re-add debug_toolbar to dev config

---
 settings2/dev.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings2/dev.py b/settings2/dev.py
index e932804bf6..48c512266b 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -26,8 +26,8 @@ DATABASES = {
 # MITX_FEATURES['SAMPLE'] = True  # Switch to this system so we get around the shadowing
 
 # Add the debug toolbar...
-#INSTALLED_APPS += ('debug_toolbar',) 
-#MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE_CLASSES
+INSTALLED_APPS += ('debug_toolbar',) 
+MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (

From e36f309bb8e0460f3e617ba4778cc2c4ea4bdf08 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 13:36:18 -0400
Subject: [PATCH 11/39] update symlinks to keep references to static assets in
 wiki happy

---
 static/js/mathjax | 1 +
 static/simplewiki | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 static/js/mathjax

diff --git a/static/js/mathjax b/static/js/mathjax
new file mode 120000
index 0000000000..b33a920293
--- /dev/null
+++ b/static/js/mathjax
@@ -0,0 +1 @@
+mathjax-MathJax-c9db6ac/
\ No newline at end of file
diff --git a/static/simplewiki b/static/simplewiki
index 1f643ef532..3b78b870e5 120000
--- a/static/simplewiki
+++ b/static/simplewiki
@@ -1 +1 @@
-../../mitx/simplewiki/media/
\ No newline at end of file
+../djangoapps/simplewiki/media/
\ No newline at end of file

From d267812f7e1be9b462acaae9ec73065d0273b6a0 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Thu, 22 Mar 2012 13:37:07 -0400
Subject: [PATCH 12/39] make settings2 config aware of courseware problem
 templates

---
 settings2/common.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/settings2/common.py b/settings2/common.py
index 3a4003d5cb..319c5f2fc8 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -68,13 +68,15 @@ MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['course'] = [DATA_DIR]
 MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
 MAKO_TEMPLATES['custom_tags'] = [DATA_DIR / 'custom_tags']
-MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', DATA_DIR / 'info']
+MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', 
+                          DATA_DIR / 'info',
+                          DATA_DIR / 'problems']
 
 # This is where Django Template lookup is defined. There are a few of these 
 # still left lying around.
 TEMPLATE_DIRS = (
     PROJECT_ROOT / "templates",
-    DATA_DIR / "templates",
+    DATA_DIR / "problems",
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

From bd7740a8ddd3681502466a46e3279eeeda2cba53 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Fri, 23 Mar 2012 10:48:49 -0400
Subject: [PATCH 13/39] removed conditional loading of apps

---
 settings2/common.py | 78 ++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/settings2/common.py b/settings2/common.py
index 319c5f2fc8..13e909ba15 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -10,7 +10,11 @@ We should make a method that calls all these config methods so that you just
 make one call at the end of your site-specific dev file to reset all the
 dependent variables (like INSTALLED_APPS) for you.
 
-TODO:
+IMMEDIATE TODO:
+1. Fix logging()
+2. 
+
+Longer TODO:
 1. Right now our treatment of static content in general and in particular 
    course-specific static content is haphazard.
 2. We should have a more disciplined approach to feature flagging, even if it
@@ -314,43 +318,37 @@ MIDDLEWARE_CLASSES = (
 )
 
 ################################### APPS #######################################
-def installed_apps():
-    """If you want to get a different set of INSTALLED_APPS out of this, you'll
-    have to set ASKBOT_ENABLED and COURSEWARE_ENABLED to True/False and call 
-    this method. We can't just take these as params because other pieces of the
-    code check fo the value of these constants.
-    """
-    # We always install these
-    STANDARD_APPS = ['django.contrib.auth',
-                     'django.contrib.contenttypes',
-                     'django.contrib.humanize',
-                     'django.contrib.sessions',
-                     'django.contrib.sites',
-                     'django.contrib.messages',
-                     'django.contrib.staticfiles',
-                     'track',
-                     'util']
-    COURSEWARE_APPS = ['circuit',
-                       'courseware',
-                       'student',
-                       'static_template_view',
-                       'staticbook',
-                       'simplewiki',
-                       'perfstats']
-    ASKBOT_APPS = ['django.contrib.sitemaps',
-                   'django.contrib.admin',
-                   'south',
-                   'askbot.deps.livesettings',
-                   'askbot',
-                   'keyedcache',
-                   'robots',
-                   'django_countries',
-                   'djcelery',
-                   'djkombu',
-                   'followit']
-    
-    return tuple(STANDARD_APPS + 
-                 (COURSEWARE_APPS if COURSEWARE_ENABLED else []) +
-                 (ASKBOT_APPS if ASKBOT_ENABLED else []))
+INSTALLED_APPS = (
+    # Standard ones that are always installed...
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.humanize',
+    'django.contrib.messages',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.staticfiles',
+    'south',
 
-INSTALLED_APPS = installed_apps()
+    # Our courseware
+    'circuit',
+    'courseware',
+    'perfstats',
+    'student',
+    'static_template_view',
+    'staticbook',
+    'simplewiki',
+    'track',
+    'util',
+
+    # For Askbot 
+    'django.contrib.sitemaps',
+    'django.contrib.admin',
+    'django_countries',
+    'djcelery',
+    'djkombu',
+    'askbot',
+    'askbot.deps.livesettings',
+    'followit',
+    'keyedcache',
+    'robots',
+)

From 8a2fb65448e9672709acdae7d898b1eab3449423 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Fri, 23 Mar 2012 10:49:33 -0400
Subject: [PATCH 14/39] minor organizational changes to the dev config file to
 put things more likely to change up top

---
 settings2/dev.py | 55 +++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/settings2/dev.py b/settings2/dev.py
index 48c512266b..5fcc188f97 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -5,7 +5,7 @@ sessions. Assumes structure:
 /envroot/
         /db   # This is where it'll write the database file
         /mitx # The location of this repo
-
+        /log  # Where we're going to write log files
 """
 from common import *
 
@@ -19,13 +19,31 @@ DATABASES = {
     }
 }
 
-# This is disabling ASKBOT, but not properly overwriting INSTALLED_APPS. ???
-# It's because our ASKBOT_ENABLED here is actually shadowing the real one.
-# 
-# ASKBOT_ENABLED = True
-# MITX_FEATURES['SAMPLE'] = True  # Switch to this system so we get around the shadowing
+CACHES = {
+    # This is the cache used for most things. Askbot will not work without a 
+    # functioning cache -- it relies on caching to load its settings in places.
+    # In staging/prod envs, the sessions also live here.
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'mitx_loc_mem_cache'
+    },
 
-# Add the debug toolbar...
+    # The general cache is what you get if you use our util.cache. It's used for
+    # things like caching the course.xml file for different A/B test groups.
+    # We set it to be a DummyCache to force reloading of course.xml in dev.
+    # In staging environments, we would grab VERSION from data uploaded by the
+    # push process.
+    'general': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+        'KEY_PREFIX': 'general',
+        'VERSION': 4,
+    }
+}
+
+# Dummy secret key for dev
+SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+
+################################ DEBUG TOOLBAR #################################
 INSTALLED_APPS += ('debug_toolbar',) 
 MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 INTERNAL_IPS = ('127.0.0.1',)
@@ -42,7 +60,7 @@ DEBUG_TOOLBAR_PANELS = (
 #  'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
 )
 
-# Storage for uploaded files (askbot file uploads at the moment)
+############################ FILE UPLOADS (ASKBOT) #############################
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 MEDIA_ROOT = ENV_ROOT / "uploads"
 MEDIA_URL = "/discussion/upfiles/"
@@ -51,24 +69,3 @@ FILE_UPLOAD_HANDLERS = (
     'django.core.files.uploadhandler.MemoryFileUploadHandler',
     'django.core.files.uploadhandler.TemporaryFileUploadHandler',
 )
-
-CACHES = {
-    # This is the cache used for most things. Askbot will not work without a 
-    # functioning cache -- it relies on caching to load its settings in places.
-    # In staging/prod envs, the sessions also live here.
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        'LOCATION': 'mitx_loc_mem_cache'
-    },
-
-    # The general cache is what you get if you use our util.cache. It's used for
-    # things like caching the course.xml file for different A/B test groups.
-    # We set it to be a DummyCache to force reloading of course.xml in dev.
-    'general': {
-        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-        'KEY_PREFIX': 'general',
-    }
-}
-
-# Dummy secret key for dev
-SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'

From 6d3d83e3aabd902b9d5a277fea35621613a4cbb6 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Fri, 23 Mar 2012 10:55:37 -0400
Subject: [PATCH 15/39] Turned on settings and profiling in django_toolbar for
 dev settings

---
 settings2/dev.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings2/dev.py b/settings2/dev.py
index 5fcc188f97..262bf9d755 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -51,13 +51,13 @@ INTERNAL_IPS = ('127.0.0.1',)
 DEBUG_TOOLBAR_PANELS = (
    'debug_toolbar.panels.version.VersionDebugPanel',
    'debug_toolbar.panels.timer.TimerDebugPanel',
-#  'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+   'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
    'debug_toolbar.panels.headers.HeaderDebugPanel',
    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
    'debug_toolbar.panels.sql.SQLDebugPanel',
    'debug_toolbar.panels.signals.SignalDebugPanel',
    'debug_toolbar.panels.logger.LoggingPanel',
-#  'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
+   'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
 )
 
 ############################ FILE UPLOADS (ASKBOT) #############################

From 148ec47107d45aea0d94fd2bb0a338ad88670109 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Fri, 23 Mar 2012 12:15:27 -0400
Subject: [PATCH 16/39] document assumptions for devplus env

---
 settings2/devplus.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/settings2/devplus.py b/settings2/devplus.py
index 002fef4d0c..9ab57b3d7a 100644
--- a/settings2/devplus.py
+++ b/settings2/devplus.py
@@ -3,17 +3,26 @@ This config file tries to mimic the production environment more closely than the
 normal dev.py. It assumes you're running a local instance of MySQL 5.1 and that
 you're running memcached. You'll want to use this to test caching and database
 migrations.
+
+Assumptions:
+* MySQL 5.1 (version important -- askbot breaks on 5.5)
+
+Dir structure:
+/envroot/
+        /mitx # The location of this repo
+        /log  # Where we're going to write log files
+
 """
 from dev import *
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'wwc',  # Or path to database file if using sqlite3.
-        'USER': 'root', # Not used with sqlite3.
-        'PASSWORD': '', # Not used with sqlite3.
-        'HOST': '127.0.0.1', # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'wwc',
+        'USER': 'root',
+        'PASSWORD': '',
+        'HOST': '127.0.0.1',
+        'PORT': '3306',
     }
 }
 
@@ -26,7 +35,7 @@ CACHES = {
        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
        'LOCATION': '127.0.0.1:11211',
        'KEY_PREFIX' : 'general',
-       'VERSION' : 3,
+       'VERSION' : 5,
    }
 }
 

From 942bfd233dce13dac34c3a9410bd5c5d9710a261 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Fri, 23 Mar 2012 12:24:01 -0400
Subject: [PATCH 17/39] fixed typo in devplus env

---
 settings2/devplus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings2/devplus.py b/settings2/devplus.py
index 9ab57b3d7a..2ec38b53a0 100644
--- a/settings2/devplus.py
+++ b/settings2/devplus.py
@@ -30,7 +30,7 @@ CACHES = {
    'default': {
        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
        'LOCATION': '127.0.0.1:11211',
-   }
+   },
    'general': {
        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
        'LOCATION': '127.0.0.1:11211',

From 7ffa71d45edcd4d8c2d8fb3701d2236443f2746b Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Sat, 24 Mar 2012 21:30:56 -0400
Subject: [PATCH 18/39] move logging config to separate file

---
 settings2/common.py      | 93 ++--------------------------------------
 settings2/dev.py         |  5 +++
 settings2/logsettings.py | 86 +++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 90 deletions(-)
 create mode 100644 settings2/logsettings.py

diff --git a/settings2/common.py b/settings2/common.py
index 13e909ba15..6b1ebb430d 100644
--- a/settings2/common.py
+++ b/settings2/common.py
@@ -22,15 +22,14 @@ Longer TODO:
 3. We need to handle configuration for multiple courses. This could be as 
    multiple sites, but we do need a way to map their data assets.
 """
-import os
-import platform
 import sys
 import tempfile
 
 import djcelery
 from path import path
 
-from askbotsettings import LIVESETTINGS_OPTIONS
+from askbotsettings import * # this is where LIVESETTINGS_OPTIONS comes from
+import logsettings
 
 ################################### FEATURES ###################################
 COURSEWARE_ENABLED = True
@@ -126,6 +125,7 @@ SITE_NAME = "localhost:8000"
 CSRF_COOKIE_DOMAIN = '127.0.0.1'
 HTTPS = 'on'
 ROOT_URLCONF = 'mitx.urls'
+IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -161,93 +161,6 @@ LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html
 USE_I18N = True
 USE_L10N = True
 
-################################### LOGGING ####################################
-# Might want to rewrite this to use logger code and push more things to the root
-# logger.
-pid = os.getpid() # So we can log which process is creating the log
-hostname = platform.node().split(".")[0]
-
-LOG_DIR = "/tmp"
-SYSLOG_ADDRESS = ('syslog.m.i4x.org', 514)
-TRACKING_LOG_FILE = LOG_DIR + "/tracking_{0}.log".format(pid)
-
-handlers = ['console']
-
-# FIXME: re-enable syslogger later
-# if not DEBUG:
-#     handlers.append('syslogger')
-
-LOGGING_ENV = "dev" # override this in different environments
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': True,
-    'formatters' : {
-        'standard' : {
-            'format' : '%(asctime)s %(levelname)s %(process)d [%(name)s] %(filename)s:%(lineno)d - %(message)s',
-        },
-        'syslog_format' : {
-            'format' : '[%(name)s][env:' + LOGGING_ENV + '] %(levelname)s [' + \
-                        hostname + ' %(process)d] [%(filename)s:%(lineno)d] - %(message)s',
-        },
-        'raw' : {
-            'format' : '%(message)s',
-        }
-    },
-    'handlers' : {
-        'console' : {
-            'level' : 'DEBUG' if DEBUG else 'INFO',
-            'class' : 'logging.StreamHandler',
-            'formatter' : 'standard',
-            'stream' : sys.stdout,
-        },
-        'console_err' : {
-            'level' : 'ERROR',
-            'class' : 'logging.StreamHandler',
-            'formatter' : 'standard',
-            'stream' : sys.stderr,
-        },
-        'syslogger' : {
-            'level' : 'INFO',
-            'class' : 'logging.handlers.SysLogHandler',
-            'address' : SYSLOG_ADDRESS,
-            'formatter' : 'syslog_format',
-        },
-        'tracking' : {
-            'level' : 'DEBUG',
-            'class' : 'logging.handlers.WatchedFileHandler',
-            'filename' : TRACKING_LOG_FILE,
-            'formatter' : 'raw',
-        },
-        'mail_admins' : {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler',
-        },
-    },
-    'loggers' : {
-        'django' : {
-            'handlers' : handlers + ['mail_admins'],
-            'propagate' : True,
-            'level' : 'INFO'
-        },
-        'tracking' : {
-            'handlers' : ['tracking'],
-            'level' : 'DEBUG',
-            'propagate' : False,
-        },
-        'root' : {
-            'handlers' : handlers,
-            'level' : 'DEBUG',
-            'propagate' : False
-        },
-        'mitx' : {
-            'handlers' : handlers,
-            'level' : 'DEBUG',
-            'propagate' : False
-        },
-    }
-}
-
 #################################### AWS #######################################
 # S3BotoStorage insists on a timeout for uploaded assets. We should make it 
 # permanent instead, but rather than trying to figure out exactly where that
diff --git a/settings2/dev.py b/settings2/dev.py
index 262bf9d755..e04e62b687 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -12,6 +12,11 @@ from common import *
 DEBUG = True
 TEMPLATE_DEBUG = True
 
+LOGGING = logsettings.get_logger_config(ENV_ROOT / "log", 
+                                        logging_env="dev",
+                                        tracking_filename="tracking.log",
+                                        debug=True)
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
diff --git a/settings2/logsettings.py b/settings2/logsettings.py
new file mode 100644
index 0000000000..3d4dbc64e4
--- /dev/null
+++ b/settings2/logsettings.py
@@ -0,0 +1,86 @@
+import os
+import os.path
+import platform
+import sys
+
+def get_logger_config(log_dir, 
+                      logging_env="no_env", 
+                      tracking_filename=None,
+                      syslog_addr=None,
+                      debug=False):
+    """Return the appropriate logging config dictionary. You should assign the
+    result of this to the LOGGING var in your settings. The reason it's done 
+    this way instead of registering directly is because I didn't want to worry
+    about resetting the logging state if this is called multiple times when 
+    settings are extended."""
+
+    # If we're given an explicit place to put tracking logs, we do that (say for
+    # debugging). However, logging is not safe for multiple processes hitting 
+    # the same file. So if it's left blank, we dynamically create the filename
+    # based on the PID of this worker process.
+    if tracking_filename:
+        tracking_file_loc = os.path.join(log_dir, tracking_filename)
+    else:
+        pid = os.getpid() # So we can log which process is creating the log
+        tracking_file_loc = os.path.join(log_dir, "tracking_{0}.log".format(pid))
+
+    hostname = platform.node().split(".")[0]
+    syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s [{hostname} " +
+                     " %(process)d] [%(filename)s:%(lineno)d] - %(message)s").format(
+                        logging_env=logging_env, hostname=hostname)
+
+    handlers = ['console'] if debug else ['syslog']
+
+    return {
+        'version': 1,
+        'disable_existing_loggers': True,
+        'formatters' : {
+            'standard' : {
+                'format' : '%(asctime)s %(levelname)s %(process)d [%(name)s] %(filename)s:%(lineno)d - %(message)s',
+            },
+            'syslog_format' : { 'format' : syslog_format },
+            'raw' : { 'format' : '%(message)s' },
+        },
+        'handlers' : {
+            'console' : {
+                'level' : 'DEBUG' if debug else 'INFO',
+                'class' : 'logging.StreamHandler',
+                'formatter' : 'standard',
+                'stream' : sys.stdout,
+            },
+            'syslogger' : {
+                'level' : 'INFO',
+                'class' : 'logging.handlers.SysLogHandler',
+                'address' : syslog_addr,
+                'formatter' : 'syslog_format',
+            },
+            'tracking' : {
+                'level' : 'DEBUG',
+                'class' : 'logging.handlers.WatchedFileHandler',
+                'filename' : tracking_file_loc,
+                'formatter' : 'raw',
+            },
+        },
+        'loggers' : {
+            'django' : {
+                'handlers' : handlers,
+                'propagate' : True,
+                'level' : 'INFO'
+            },
+            'tracking' : {
+                'handlers' : ['tracking'],
+                'level' : 'DEBUG',
+                'propagate' : False,
+            },
+            'root' : {
+                'handlers' : handlers,
+                'level' : 'DEBUG',
+                'propagate' : False
+            },
+            'mitx' : {
+                'handlers' : handlers,
+                'level' : 'DEBUG',
+                'propagate' : False
+            },
+        }
+    }
\ No newline at end of file

From d1cd7e50c0339c4f2936c101ffd0da88eceb680b Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 2 Apr 2012 14:09:53 -0400
Subject: [PATCH 19/39] change logging from mitx.user to mitx.student to
 reflect package structure

---
 djangoapps/student/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djangoapps/student/views.py b/djangoapps/student/views.py
index b8194b3e61..c012666b84 100644
--- a/djangoapps/student/views.py
+++ b/djangoapps/student/views.py
@@ -17,7 +17,7 @@ from mitxmako.shortcuts import render_to_response, render_to_string
 from models import Registration, UserProfile
 from django_future.csrf import ensure_csrf_cookie
 
-log = logging.getLogger("mitx.user")
+log = logging.getLogger("mitx.student")
 
 def csrf_token(context):
     csrf_token = context.get('csrf_token', '')

From a90e6e3243d7804d9a92fca0f6b60ef467091044 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 2 Apr 2012 14:11:23 -0400
Subject: [PATCH 20/39] Disable profiler in django-debug-toolbar to avoid
 duplicate request bug

---
 settings2/dev.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/settings2/dev.py b/settings2/dev.py
index e04e62b687..1a62eaf382 100644
--- a/settings2/dev.py
+++ b/settings2/dev.py
@@ -62,7 +62,12 @@ DEBUG_TOOLBAR_PANELS = (
    'debug_toolbar.panels.sql.SQLDebugPanel',
    'debug_toolbar.panels.signals.SignalDebugPanel',
    'debug_toolbar.panels.logger.LoggingPanel',
-   'debug_toolbar.panels.profiling.ProfilingDebugPanel', # Lots of overhead
+
+#  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
+#  Django=1.3.1/1.4 where requests to views get duplicated (your method gets 
+#  hit twice). So you can uncomment when you need to diagnose performance 
+#  problems, but you shouldn't leave it on.
+#  'debug_toolbar.panels.profiling.ProfilingDebugPanel',
 )
 
 ############################ FILE UPLOADS (ASKBOT) #############################

From 3a95e3f79f3478d343f1ece40b1ec8df099492ad Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 2 Apr 2012 14:15:44 -0400
Subject: [PATCH 21/39] Moving settings2/ folder to envs/

---
 {settings2 => envs}/README.txt        | 0
 {settings2 => envs}/__init__.py       | 0
 {settings2 => envs}/askbotsettings.py | 0
 {settings2 => envs}/aws.py            | 0
 {settings2 => envs}/common.py         | 0
 {settings2 => envs}/dev.py            | 0
 {settings2 => envs}/devplus.py        | 0
 {settings2 => envs}/loadtest.py       | 0
 {settings2 => envs}/logsettings.py    | 0
 {settings2 => envs}/staging.py        | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename {settings2 => envs}/README.txt (100%)
 rename {settings2 => envs}/__init__.py (100%)
 rename {settings2 => envs}/askbotsettings.py (100%)
 rename {settings2 => envs}/aws.py (100%)
 rename {settings2 => envs}/common.py (100%)
 rename {settings2 => envs}/dev.py (100%)
 rename {settings2 => envs}/devplus.py (100%)
 rename {settings2 => envs}/loadtest.py (100%)
 rename {settings2 => envs}/logsettings.py (100%)
 rename {settings2 => envs}/staging.py (100%)

diff --git a/settings2/README.txt b/envs/README.txt
similarity index 100%
rename from settings2/README.txt
rename to envs/README.txt
diff --git a/settings2/__init__.py b/envs/__init__.py
similarity index 100%
rename from settings2/__init__.py
rename to envs/__init__.py
diff --git a/settings2/askbotsettings.py b/envs/askbotsettings.py
similarity index 100%
rename from settings2/askbotsettings.py
rename to envs/askbotsettings.py
diff --git a/settings2/aws.py b/envs/aws.py
similarity index 100%
rename from settings2/aws.py
rename to envs/aws.py
diff --git a/settings2/common.py b/envs/common.py
similarity index 100%
rename from settings2/common.py
rename to envs/common.py
diff --git a/settings2/dev.py b/envs/dev.py
similarity index 100%
rename from settings2/dev.py
rename to envs/dev.py
diff --git a/settings2/devplus.py b/envs/devplus.py
similarity index 100%
rename from settings2/devplus.py
rename to envs/devplus.py
diff --git a/settings2/loadtest.py b/envs/loadtest.py
similarity index 100%
rename from settings2/loadtest.py
rename to envs/loadtest.py
diff --git a/settings2/logsettings.py b/envs/logsettings.py
similarity index 100%
rename from settings2/logsettings.py
rename to envs/logsettings.py
diff --git a/settings2/staging.py b/envs/staging.py
similarity index 100%
rename from settings2/staging.py
rename to envs/staging.py

From f0d80a0738e8e40e1bd1eab692ae15ec3c180a69 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 2 Apr 2012 14:20:00 -0400
Subject: [PATCH 22/39] Flesh out the README.txt for the new settings
 arrangement

---
 envs/README.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/envs/README.txt b/envs/README.txt
index 671fded176..8f2e4b6623 100644
--- a/envs/README.txt
+++ b/envs/README.txt
@@ -1,4 +1,10 @@
 Transitional for moving to new settings scheme. 
 
 To use: 
-django-admin.py runserver --settings=settings2.dev --pythonpath="."
+  django-admin.py runserver --settings=envs.dev --pythonpath=.
+
+NOTE: Using manage.py will automatically run mitx/settings.py first, regardless
+of what you send it for an explicit --settings flag. It still works, but might
+have odd side effects. Using django-admin.py avoids that problem. 
+django-admin.py is installed by default when you install Django.
+

From 55312bf7db963c4dc84c89aac6355bc4cc64fafd Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 2 Apr 2012 14:58:04 -0400
Subject: [PATCH 23/39] show instructions for gunicorn

---
 envs/README.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/envs/README.txt b/envs/README.txt
index 8f2e4b6623..7a527b290f 100644
--- a/envs/README.txt
+++ b/envs/README.txt
@@ -8,3 +8,7 @@ of what you send it for an explicit --settings flag. It still works, but might
 have odd side effects. Using django-admin.py avoids that problem. 
 django-admin.py is installed by default when you install Django.
 
+To use with gunicorn_django in debug mode:
+
+  gunicorn_django envs/dev.py
+

From d7131c8b13bc7f5b1aa003022d0b36822856207f Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 2 Apr 2012 16:38:33 -0400
Subject: [PATCH 24/39] Update requirements: add path.py (used in settings),
 remove flup (only necessary for FCGI)

---
 envs/loadtest.py |  3 ---
 envs/staging.py  | 13 -------------
 requirements.txt |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 envs/loadtest.py
 delete mode 100644 envs/staging.py

diff --git a/envs/loadtest.py b/envs/loadtest.py
deleted file mode 100644
index 172fbcc125..0000000000
--- a/envs/loadtest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from common import *
-
-GENERATE_RANDOM_USER_CREDENTIALS = True
diff --git a/envs/staging.py b/envs/staging.py
deleted file mode 100644
index 0c7dba41b6..0000000000
--- a/envs/staging.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from aws import *
-
-# Staging specific overrides
-SITE_NAME = "staging.mitx.mit.edu"
-AWS_STORAGE_BUCKET_NAME = 'mitx_askbot_stage'
-CACHES['default']['LOCATION'] = ['***REMOVED***', 
-			                     '***REMOVED***']
-
-### Secure Data Below Here ###
-SECRET_KEY = ""
-AWS_ACCESS_KEY_ID = ""
-AWS_SECRET_ACCESS_KEY = ""
-
diff --git a/requirements.txt b/requirements.txt
index a9fc71e6c9..e7f404d821 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 django<1.4
 pip
-flup
 scipy
 matplotlib
 markdown
@@ -12,3 +11,4 @@ boto
 mako
 python-memcached
 django-celery
+path.py

From ab6ec55a836df73b98a73258e0b3ed55a5299e95 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Tue, 3 Apr 2012 12:54:02 -0400
Subject: [PATCH 25/39] Convert AWS settings to pull values from JSON files

---
 envs/aws.py    | 63 ++++++++++++++++++++++++++++++++++++++++++++++----
 envs/common.py |  4 ----
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/envs/aws.py b/envs/aws.py
index 138f52c255..45f170e184 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -1,12 +1,36 @@
+"""
+This is the default template for our main set of AWS servers. This does NOT
+cover the content machines, which use content.py
+
+Common traits:
+* Use memcached, and cache-backed sessions
+* Use a MySQL 5.1 database
+"""
+import json
+
 from common import *
 
+############################### ALWAYS THE SAME ################################
+DEBUG = False
+TEMPLATE_DEBUG = False
+
 EMAIL_BACKEND = 'django_ses.SESBackend'
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
 DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 
-CSRF_COOKIE_DOMAIN = '.mitx.mit.edu'
-LIB_URL = 'https://mitxstatic.s3.amazonaws.com/js/'
-BOOK_URL = 'https://mitxstatic.s3.amazonaws.com/book_images/'
+########################### NON-SECURE ENV CONFIG ##############################
+# Things like server locations, ports, etc.
+with open(BASE_DIR / "env.json") as env_file:
+    ENV_TOKENS = json.load(env_file)
+
+SITE_NAME = ENV_TOKENS['SITE_NAME'] # "extstage.mitx.mit.edu"
+CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN'] # '.mitx.mit.edu'
+
+BOOK_URL = ENV_TOKENS['BOOK_URL'] # 'https://mitxstatic.s3.amazonaws.com/book_images/'
+LIB_URL = ENV_TOKENS['LIB_URL'] # 'https://mitxstatic.s3.amazonaws.com/js/'
+MEDIA_URL = ENV_TOKENS['MEDIA_URL'] # 'http://s3.amazonaws.com/mitx_askbot_stage/'
+
+LOG_DIR = ENV_TOKENS['LOG_DIR'] # "/mnt/logs/"
 
 CACHES = {
     'default': {
@@ -14,5 +38,34 @@ CACHES = {
     }
 }
 
-DEBUG = False
-TEMPLATE_DEBUG = False
+CACHES = {
+   'default': {
+       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+       'LOCATION': '127.0.0.1:11211',
+   },
+   'general': {
+       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+       'LOCATION': '127.0.0.1:11211',
+       'KEY_PREFIX' : 'general',
+       'VERSION' : 5,
+   }
+}
+
+############################## SECURE AUTH ITEMS ###############################
+# Secret things: passwords, access keys, etc.
+with open(BASE_DIR / "auth.json") as auth_file:
+    AUTH_TOKENS = json.load(auth_file)
+
+AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
+AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'wwc',
+        'USER': 'root',
+        'PASSWORD': authtokens["PASSWORD"],
+        'HOST': '***REMOVED***',
+        'PORT': '3306',
+    }
+}
\ No newline at end of file
diff --git a/envs/common.py b/envs/common.py
index 6b1ebb430d..88e14ec302 100644
--- a/envs/common.py
+++ b/envs/common.py
@@ -10,10 +10,6 @@ We should make a method that calls all these config methods so that you just
 make one call at the end of your site-specific dev file to reset all the
 dependent variables (like INSTALLED_APPS) for you.
 
-IMMEDIATE TODO:
-1. Fix logging()
-2. 
-
 Longer TODO:
 1. Right now our treatment of static content in general and in particular 
    course-specific static content is haphazard.

From 9fe7f5626d9fa1b4b9058b2ec7910600fa14e425 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 12:22:03 -0400
Subject: [PATCH 26/39] add django toolbar to depenedencies

---
 requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index e7f404d821..f589c7c732 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,3 +12,5 @@ mako
 python-memcached
 django-celery
 path.py
+django_debug_toolbar
+

From f0bec48c54c3f37b0953893f7972fe1471827b1e Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 16:11:54 -0400
Subject: [PATCH 27/39] move more of our AWS config to tokens from JSON files

---
 envs/aws.py | 41 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/envs/aws.py b/envs/aws.py
index 45f170e184..8e2410b7f6 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -26,46 +26,21 @@ with open(BASE_DIR / "env.json") as env_file:
 SITE_NAME = ENV_TOKENS['SITE_NAME'] # "extstage.mitx.mit.edu"
 CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN'] # '.mitx.mit.edu'
 
-BOOK_URL = ENV_TOKENS['BOOK_URL'] # 'https://mitxstatic.s3.amazonaws.com/book_images/'
-LIB_URL = ENV_TOKENS['LIB_URL'] # 'https://mitxstatic.s3.amazonaws.com/js/'
-MEDIA_URL = ENV_TOKENS['MEDIA_URL'] # 'http://s3.amazonaws.com/mitx_askbot_stage/'
+BOOK_URL = ENV_TOKENS['BOOK_URL']
+LIB_URL = ENV_TOKENS['LIB_URL']
+MEDIA_URL = ENV_TOKENS['MEDIA_URL']
+LOG_DIR = ENV_TOKENS['LOG_DIR']
 
-LOG_DIR = ENV_TOKENS['LOG_DIR'] # "/mnt/logs/"
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-    }
-}
-
-CACHES = {
-   'default': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-       'LOCATION': '127.0.0.1:11211',
-   },
-   'general': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-       'LOCATION': '127.0.0.1:11211',
-       'KEY_PREFIX' : 'general',
-       'VERSION' : 5,
-   }
-}
+CACHES = ENV_TOKENS['CACHES']
 
 ############################## SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.
 with open(BASE_DIR / "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
+SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
+
 AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
 AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'wwc',
-        'USER': 'root',
-        'PASSWORD': authtokens["PASSWORD"],
-        'HOST': '***REMOVED***',
-        'PORT': '3306',
-    }
-}
\ No newline at end of file
+DATABASES = AUTH_TOKENS['DATABASES']
\ No newline at end of file

From f6509a68589293b1536d7efddd93054d06e511fa Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 16:13:37 -0400
Subject: [PATCH 28/39] use ENV_ROOT instead of BASE_DIR

---
 envs/aws.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/envs/aws.py b/envs/aws.py
index 8e2410b7f6..f113dca6ca 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -20,7 +20,7 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 
 ########################### NON-SECURE ENV CONFIG ##############################
 # Things like server locations, ports, etc.
-with open(BASE_DIR / "env.json") as env_file:
+with open(ENV_ROOT / "env.json") as env_file:
     ENV_TOKENS = json.load(env_file)
 
 SITE_NAME = ENV_TOKENS['SITE_NAME'] # "extstage.mitx.mit.edu"
@@ -35,7 +35,7 @@ CACHES = ENV_TOKENS['CACHES']
 
 ############################## SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.
-with open(BASE_DIR / "auth.json") as auth_file:
+with open(ENV_ROOT / "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 SECRET_KEY = AUTH_TOKENS['SECRET_KEY']

From ef5b6f6537254619c677bf3fc972e44b86809a80 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 16:24:16 -0400
Subject: [PATCH 29/39] remove LIB_URL from env config (it's always local)

---
 envs/aws.py    | 1 -
 envs/common.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/envs/aws.py b/envs/aws.py
index f113dca6ca..f8414cc747 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -27,7 +27,6 @@ SITE_NAME = ENV_TOKENS['SITE_NAME'] # "extstage.mitx.mit.edu"
 CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN'] # '.mitx.mit.edu'
 
 BOOK_URL = ENV_TOKENS['BOOK_URL']
-LIB_URL = ENV_TOKENS['LIB_URL']
 MEDIA_URL = ENV_TOKENS['MEDIA_URL']
 LOG_DIR = ENV_TOKENS['LOG_DIR']
 
diff --git a/envs/common.py b/envs/common.py
index 88e14ec302..e29ffbf7aa 100644
--- a/envs/common.py
+++ b/envs/common.py
@@ -96,7 +96,6 @@ TEXTBOOK_DIR = ENV_ROOT / "book_images"
 # We should have separate S3 staged URLs in case we need to make changes to 
 # these assets and test them.
 LIB_URL = '/static/js/'
-# LIB_URL = 'https://mitxstatic.s3.amazonaws.com/js/' # For AWS deploys
 
 # Dev machines shouldn't need the book
 # BOOK_URL = '/static/book/'

From be0fdf0cbcb89dd0e5f906504ecc25f2f3f702e6 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 16:32:54 -0400
Subject: [PATCH 30/39] add config for content machines

---
 envs/content.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 envs/content.py

diff --git a/envs/content.py b/envs/content.py
new file mode 100644
index 0000000000..33c2e5e0a9
--- /dev/null
+++ b/envs/content.py
@@ -0,0 +1,10 @@
+"""
+These are debug machines used for content creators, so they're kind of a cross
+between dev machines and AWS machines.
+"""
+from aws import *
+
+DEBUG = True
+TEMPLATE_DEBUG = True
+
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

From 29b3b0cfeb395aeeacdcca1d640cecc6603d0be1 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 16:39:04 -0400
Subject: [PATCH 31/39] remove unnecessary comments

---
 envs/aws.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/envs/aws.py b/envs/aws.py
index f8414cc747..0919e3ac6a 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -23,8 +23,8 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 with open(ENV_ROOT / "env.json") as env_file:
     ENV_TOKENS = json.load(env_file)
 
-SITE_NAME = ENV_TOKENS['SITE_NAME'] # "extstage.mitx.mit.edu"
-CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN'] # '.mitx.mit.edu'
+SITE_NAME = ENV_TOKENS['SITE_NAME']
+CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN']
 
 BOOK_URL = ENV_TOKENS['BOOK_URL']
 MEDIA_URL = ENV_TOKENS['MEDIA_URL']

From 8f4696a1ea70f867e1acfc97e493ec7669052c8b Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 16:57:35 -0400
Subject: [PATCH 32/39] add logging environment to ENV_TOKENS

---
 envs/aws.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/envs/aws.py b/envs/aws.py
index 0919e3ac6a..24e625f62b 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -32,6 +32,11 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
 
 CACHES = ENV_TOKENS['CACHES']
 
+LOGGING = logsettings.get_logger_config(LOG_DIR, 
+                                        logging_env=ENV_TOKENS['LOGGING_ENV'],
+                                        tracking_filename="tracking.log",
+                                        debug=False)
+
 ############################## SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.
 with open(ENV_ROOT / "auth.json") as auth_file:

From ddb425dae68099457e0e962f393e9f853deba312 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 17:04:18 -0400
Subject: [PATCH 33/39] point aws settings to syslog server

---
 envs/aws.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/envs/aws.py b/envs/aws.py
index 24e625f62b..e99904b7da 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -35,6 +35,7 @@ CACHES = ENV_TOKENS['CACHES']
 LOGGING = logsettings.get_logger_config(LOG_DIR, 
                                         logging_env=ENV_TOKENS['LOGGING_ENV'],
                                         tracking_filename="tracking.log",
+                                        syslog_addr=ENV_TOKENS['SYSLOG_SERVER'],
                                         debug=False)
 
 ############################## SECURE AUTH ITEMS ###############################

From a73ba49bef66ecc754051bcb29f1408f1b405beb Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 17:07:00 -0400
Subject: [PATCH 34/39] syslog address needs to be a server, port tuple

---
 envs/aws.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/envs/aws.py b/envs/aws.py
index e99904b7da..c02d0705df 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -35,7 +35,7 @@ CACHES = ENV_TOKENS['CACHES']
 LOGGING = logsettings.get_logger_config(LOG_DIR, 
                                         logging_env=ENV_TOKENS['LOGGING_ENV'],
                                         tracking_filename="tracking.log",
-                                        syslog_addr=ENV_TOKENS['SYSLOG_SERVER'],
+                                        syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
                                         debug=False)
 
 ############################## SECURE AUTH ITEMS ###############################

From 5afddedc948b071393af1eddec576dded50f1d05 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 17:16:52 -0400
Subject: [PATCH 35/39] add debug toolbar to content machines

---
 envs/content.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/envs/content.py b/envs/content.py
index 33c2e5e0a9..c02e7bb72e 100644
--- a/envs/content.py
+++ b/envs/content.py
@@ -8,3 +8,24 @@ DEBUG = True
 TEMPLATE_DEBUG = True
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+
+################################ DEBUG TOOLBAR #################################
+INSTALLED_APPS += ('debug_toolbar',) 
+MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+
+DEBUG_TOOLBAR_PANELS = (
+   'debug_toolbar.panels.version.VersionDebugPanel',
+   'debug_toolbar.panels.timer.TimerDebugPanel',
+   'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+   'debug_toolbar.panels.headers.HeaderDebugPanel',
+   'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+   'debug_toolbar.panels.sql.SQLDebugPanel',
+   'debug_toolbar.panels.signals.SignalDebugPanel',
+   'debug_toolbar.panels.logger.LoggingPanel',
+
+#  Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
+#  Django=1.3.1/1.4 where requests to views get duplicated (your method gets 
+#  hit twice). So you can uncomment when you need to diagnose performance 
+#  problems, but you shouldn't leave it on.
+#  'debug_toolbar.panels.profiling.ProfilingDebugPanel',
+)

From 86b413ff8c0459294fcdbedab0b88d33b1492ba5 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Mon, 9 Apr 2012 17:17:03 -0400
Subject: [PATCH 36/39] fix syslogger errors

---
 envs/aws.py         | 1 -
 envs/logsettings.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/envs/aws.py b/envs/aws.py
index c02d0705df..9ce621c2bd 100644
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -34,7 +34,6 @@ CACHES = ENV_TOKENS['CACHES']
 
 LOGGING = logsettings.get_logger_config(LOG_DIR, 
                                         logging_env=ENV_TOKENS['LOGGING_ENV'],
-                                        tracking_filename="tracking.log",
                                         syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
                                         debug=False)
 
diff --git a/envs/logsettings.py b/envs/logsettings.py
index 3d4dbc64e4..9edf9ad0b3 100644
--- a/envs/logsettings.py
+++ b/envs/logsettings.py
@@ -29,7 +29,7 @@ def get_logger_config(log_dir,
                      " %(process)d] [%(filename)s:%(lineno)d] - %(message)s").format(
                         logging_env=logging_env, hostname=hostname)
 
-    handlers = ['console'] if debug else ['syslog']
+    handlers = ['console'] if debug else ['console', 'syslogger']
 
     return {
         'version': 1,

From 0316d9718c4b45b2c4af415fd1d8958329862523 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Thu, 19 Apr 2012 10:26:26 -0400
Subject: [PATCH 37/39] enable mathjax in askbot

---
 envs/askbotsettings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/envs/askbotsettings.py b/envs/askbotsettings.py
index c81252d04f..681e65763d 100644
--- a/envs/askbotsettings.py
+++ b/envs/askbotsettings.py
@@ -178,8 +178,8 @@ LIVESETTINGS_OPTIONS = {
             },
             'MARKUP' : {
                 'MARKUP_CODE_FRIENDLY' : False,
-                'ENABLE_MATHJAX' : False,  # FIXME: Test with this enabled
-                'MATHJAX_BASE_URL' : u'',
+                'ENABLE_MATHJAX' : True,
+                'MATHJAX_BASE_URL' : u'/static/js/mathjax-MathJax-c9db6ac/',
                 'ENABLE_AUTO_LINKING' : False,
                 'AUTO_LINK_PATTERNS' : u'',
                 'AUTO_LINK_URLS' : u'',

From efc057109e4ce738c5502cf01f34ca7eef22d12b Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Thu, 19 Apr 2012 10:36:14 -0400
Subject: [PATCH 38/39] remove references to unused TEXTBOOK_DIR, add comments

---
 envs/common.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/envs/common.py b/envs/common.py
index e29ffbf7aa..2b01a0911e 100644
--- a/envs/common.py
+++ b/envs/common.py
@@ -88,10 +88,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 
-# FIXME: We're not checking this out in this location yet
-# TEXTBOOK_DIR = ENV_ROOT / "books" / "circuits_agarwal_lang" # What it should eventually be
-TEXTBOOK_DIR = ENV_ROOT / "book_images"
-
 # FIXME: 
 # We should have separate S3 staged URLs in case we need to make changes to 
 # these assets and test them.
@@ -142,12 +138,8 @@ STATICFILES_DIRS = (
     PROJECT_ROOT / "static",
     ASKBOT_ROOT / "askbot" / "skins",
 
-# Something like this will probably need to be enabled when we're really doing
-# multiple courses.
-#    ("circuits", DATA_DIR / "images"),
-#    ("handouts", DATA_DIR / "handouts"),
-#    ("subs", DATA_DIR / "subs"),
-#    ("book", TEXTBOOK_DIR)
+# This is how you would use the textbook images locally
+#    ("book", ENV_ROOT / "book_images")
 )
 
 # Locale/Internationalization
@@ -209,8 +201,11 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
+
+    # Instead of AuthenticationMiddleware, we use a cached backed version
     #'django.contrib.auth.middleware.AuthenticationMiddleware',
     'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
+    
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
     'mitxmako.middleware.MakoMiddleware',

From c23d2804be9244718c9a1c5e673f783287485ded Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@mitx.mit.edu>
Date: Thu, 19 Apr 2012 10:50:32 -0400
Subject: [PATCH 39/39] slightly simplified urlpatterns setting in urls.py

---
 urls.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/urls.py b/urls.py
index 3dbfb47f8b..329d500ea0 100644
--- a/urls.py
+++ b/urls.py
@@ -75,8 +75,10 @@ if settings.ASKBOT_ENABLED:
                     url(r'^followit/', include('followit.urls')), \
 #                       url(r'^robots.txt$', include('robots.urls')),
                               )
-if settings.DEBUG:
-    urlpatterns = patterns(*urlpatterns) + staticfiles_urlpatterns()
-else:
-    urlpatterns = patterns(*urlpatterns)
+
+urlpatterns = patterns(*urlpatterns)
+
+if settings.DEBUG:
+    urlpatterns += staticfiles_urlpatterns()
+