update settings to remove server split between askbot and courseware

settings.py

-settings_old_askbot.py
+settings_new_askbot.py
\ No newline at end of file

settings_new_askbot.py

-CSRF_COOKIE_DOMAIN = '127.0.0.1'
+import os
+import sys
+
+import djcelery
 
-if 'COURSEWARE_ENABLED' not in locals():
-   COURSEWARE_ENABLED = True
-if 'ASKBOT_ENABLED' not in locals():
-   ASKBOT_ENABLED = True
-if not COURSEWARE_ENABLED:
-   ASKBOT_ENABLED = False
+import askbot
+import site
+
+COURSEWARE_ENABLED = True
+ASKBOT_ENABLED = True
+
+CSRF_COOKIE_DOMAIN = '127.0.0.1'
 
 # Defaults to be overridden
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -30,7 +34,7 @@ DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-   ('Piotr Mitros', 'pmitros@csail.mit.edu'),
+    ('Piotr Mitros', 'pmitros@csail.mit.edu'),
 )
 
 MANAGERS = ADMINS
@@ -59,7 +63,6 @@ STATIC_URL = '/static/'
 # Examples: "http://foo.com/static/admin/", "/static/admin/".
 ADMIN_MEDIA_PREFIX = '/static/admin/'
 
-
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
@@ -76,14 +79,14 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-   'django.middleware.common.CommonMiddleware',
-   'django.contrib.sessions.middleware.SessionMiddleware',
-   'django.middleware.csrf.CsrfViewMiddleware',
-   'django.contrib.auth.middleware.AuthenticationMiddleware',
-   'django.contrib.messages.middleware.MessageMiddleware',
-   'track.middleware.TrackMiddleware',
-   'djangomako.middleware.MakoMiddleware',
-   #'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'track.middleware.TrackMiddleware',
+    'djangomako.middleware.MakoMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 ROOT_URLCONF = 'mitx.urls'
@@ -140,118 +143,113 @@ TRACK_MAX_EVENT = 1000
 # Maximum length of log file before starting a new one. 
 MAXLOG = 500
 
-execfile("../settings.py")
+# Our parent dir (mitx_all) is the BASE_DIR
+BASE_DIR = os.path.abspath(os.path.join(__file__, "..", ".."))
+
+# Make sure we execute correctly regardless of where we're called from
+execfile(os.path.join(BASE_DIR, "settings.py"))
+
 
 if PERFSTATS :
-   MIDDLEWARE_CLASSES = ( 'perfstats.middleware.ProfileMiddleware',) + MIDDLEWARE_CLASSES
+    MIDDLEWARE_CLASSES = ( 'perfstats.middleware.ProfileMiddleware',) + MIDDLEWARE_CLASSES
 
 if 'TRACK_DIR' not in locals():
-   TRACK_DIR = BASE_DIR+'/track_dir/'
+    TRACK_DIR = BASE_DIR+'/track_dir/'
 if 'STATIC_ROOT' not in locals():
-   STATIC_ROOT = BASE_DIR+'/staticroot/'
+    STATIC_ROOT = BASE_DIR+'/staticroot/'
 if 'DATA_DIR' not in locals():
-   DATA_DIR = BASE_DIR+'/data/'
+    DATA_DIR = BASE_DIR+'/data/'
 if 'TEXTBOOK_DIR' not in locals():
-   TEXTBOOK_DIR = BASE_DIR+'/textbook/'
+    TEXTBOOK_DIR = BASE_DIR+'/textbook/'
 
 if 'TEMPLATE_DIRS' not in locals():
-   TEMPLATE_DIRS = (
-      BASE_DIR+'/templates/',
-      DATA_DIR+'/templates',
-      TEXTBOOK_DIR,
-   )
+    TEMPLATE_DIRS = (
+        BASE_DIR+'/templates/',
+        DATA_DIR+'/templates',
+        TEXTBOOK_DIR,
+    )
 
 if 'STATICFILES_DIRS' not in locals():
-   STATICFILES_DIRS = (
-      BASE_DIR+'/3rdParty/static',
-      BASE_DIR+'/static', 
-   )
-
-if ASKBOT_ENABLED:
-   import sys
-
-   if 'ASKBOT_EXTRA_SKINS_DIR' not in locals():
-      ASKBOT_EXTRA_SKINS_DIR = BASE_DIR+'/askbot-devel/askbot/skins'
-   if 'ASKBOT_DIR' not in locals():
-      ASKBOT_DIR = BASE_DIR+'/askbot-devel'
-
-   STATICFILES_DIRS = STATICFILES_DIRS + ( ASKBOT_DIR+'/askbot/skins',)
-
-   # Needed for Askbot
-   # Critical TODO: Move to S3
-   MEDIA_URL = '/discussion/upfiles/'
-   MEDIA_ROOT = ASKBOT_DIR+'/askbot/upfiles'
-
-   print "!!!", ASKBOT_DIR
-   sys.path.append(ASKBOT_DIR)
-   import os
-   import askbot
-   ASKBOT_ROOT = os.path.dirname(askbot.__file__)
-   import site
-   site.addsitedir(os.path.join(os.path.dirname(askbot.__file__), 'deps'))
-   TEMPLATE_LOADERS = TEMPLATE_LOADERS + ('askbot.skins.loaders.filesystem_load_template_source',)
-
-   MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
-     'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
+    STATICFILES_DIRS = (
+        BASE_DIR+'/3rdParty/static',
+        BASE_DIR+'/static', 
+    )
+
+if 'ASKBOT_EXTRA_SKINS_DIR' not in locals():
+    ASKBOT_EXTRA_SKINS_DIR = BASE_DIR+'/askbot-devel/askbot/skins'
+if 'ASKBOT_DIR' not in locals():
+    ASKBOT_DIR = BASE_DIR+'/askbot-devel'
+
+STATICFILES_DIRS = STATICFILES_DIRS + ( ASKBOT_DIR+'/askbot/skins',)
+
+# Needed for Askbot
+# Critical TODO: Move to S3
+MEDIA_URL = '/discussion/upfiles/'
+MEDIA_ROOT = ASKBOT_DIR+'/askbot/upfiles'
+
+ASKBOT_ROOT = os.path.dirname(askbot.__file__)
+
+site.addsitedir(os.path.join(os.path.dirname(askbot.__file__), 'deps'))
+TEMPLATE_LOADERS = TEMPLATE_LOADERS + ('askbot.skins.loaders.filesystem_load_template_source',)
+
+MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
+    'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'askbot.middleware.forum_mode.ForumModeMiddleware',
     'askbot.middleware.cancel.CancelActionMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
     'askbot.middleware.view_log.ViewLogMiddleware',
     'askbot.middleware.spaceless.SpacelessMiddleware',
-	   )
-
-   FILE_UPLOAD_TEMP_DIR = os.path.join(
-	   os.path.dirname(__file__),
-	   'tmp'
-	   ).replace('\\','/')
-   FILE_UPLOAD_HANDLERS = (
-	   'django.core.files.uploadhandler.MemoryFileUploadHandler',
-	   'django.core.files.uploadhandler.TemporaryFileUploadHandler',
-	   )
-   ASKBOT_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
-   ASKBOT_MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes
+    'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
+)
+
+FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
+FILE_UPLOAD_HANDLERS = (
+    'django.core.files.uploadhandler.MemoryFileUploadHandler',
+    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
+)
+ASKBOT_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
+ASKBOT_MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes
 #   ASKBOT_FILE_UPLOAD_DIR = os.path.join(os.path.dirname(__file__), 'askbot', 'upfiles')
-   DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-   
-   PROJECT_ROOT = os.path.dirname(__file__)
-   
-   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
-	   )
-   
-   INSTALLED_APPS = INSTALLED_APPS + (
-	   'django.contrib.sitemaps',
-	   'django.contrib.admin',
-	   'south',
-	   'askbot.deps.livesettings',
-	   'askbot',
-	   #'keyedcache', # TODO: Main askbot tree has this installed, but we get intermittent errors if we include it. 
-	   'robots',
-	   'django_countries',
-	   'djcelery',
-	   'djkombu',
-	   'followit',
-	   )
-   
-   CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
-   ASKBOT_URL = 'discussion/'
-   LOGIN_REDIRECT_URL = '/'
-   LOGIN_URL = '/'
-   
-#   ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/')
-   ALLOW_UNICODE_SLUGS = False
-   ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange
-   ASKBOT_CSS_DEVEL = True
-   
-   #Celery Settings
-   BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
-   CELERY_ALWAYS_EAGER = True
-   
-   import djcelery
-   djcelery.setup_loader()
+DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+
+PROJECT_ROOT = os.path.dirname(__file__)
+
+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
+)
+
+INSTALLED_APPS = INSTALLED_APPS + (
+    'django.contrib.sitemaps',
+    'django.contrib.admin',
+    'south',
+    'askbot.deps.livesettings',
+    'askbot',
+    #'keyedcache', # TODO: Main askbot tree has this installed, but we get intermittent errors if we include it. 
+    'robots',
+    'django_countries',
+    'djcelery',
+    'djkombu',
+    'followit',
+)
+
+CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
+ASKBOT_URL = 'discussion/'
+LOGIN_REDIRECT_URL = '/'
+LOGIN_URL = '/'
+
+# ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/')
+ALLOW_UNICODE_SLUGS = False
+ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange
+ASKBOT_CSS_DEVEL = True
+
+# Celery Settings
+BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
+CELERY_ALWAYS_EAGER = True
+
+djcelery.setup_loader()