Merge of branches/jambazov to trunk. Incoporating the new convert comment to answer...

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 2cf11e9a7d8adca3e40811c03abdbd7a96927860..bd76b22188ea3b1fa50cd03633c7c3f4b9bf61db 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -56,85 +56,28 @@ ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
 # unit byte
 ALLOW_MAX_FILE_SIZE = 1024 * 1024
 
+# User settings
+from settings_local import *
 
+try:
+    if len(FORUM_SCRIPT_ALIAS) > 0:
+        APP_URL = '%s/%s' % (APP_URL, FORUM_SCRIPT_ALIAS[:-1])
+except NameError:
+    pass
 
-def check_local_setting(name, value):
-    local_vars = locals()
-    if name in local_vars and local_vars[name] == value:
-        return True
-    else:
-        return False
-
-SITE_SRC_ROOT = os.path.dirname(__file__)
-LOG_FILENAME = 'django.osqa.log'
-
-#for logging
-import logging
-logging.basicConfig(
-    filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
-    level=logging.ERROR,
-    format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
-)
-
-#ADMINS and MANAGERS
-ADMINS = (('Forum Admin', 'forum@example.com'),)
-MANAGERS = ADMINS
-
-DEBUG = True
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': True
-}
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-if True:
-
-    DATABASE_NAME =  'meta_rep'          # Or path to database file if using sqlite3.
-    DATABASE_USER = 'postgres'               # Not used with sqlite3.
-    DATABASE_PASSWORD = 'postgres'               # Not used with sqlite3.
-    DATABASE_ENGINE = 'postgresql_psycopg2'  #mysql, etc
-    DATABASE_HOST = 'localhost'
-    DATABASE_PORT = ''
-else:
-    DATABASE_NAME =  'd:/stuff/sxtest.db'#'sxtest2rep'          # Or path to database file if using sqlite3.
-    DATABASE_USER = ''               # Not used with sqlite3.
-    DATABASE_PASSWORD = ''               # Not used with sqlite3.
-    DATABASE_ENGINE = 'sqlite3'  #mysql, etc
-    DATABASE_HOST = ''
-    DATABASE_PORT = ''
-
-#CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
-#CACHE_BACKEND = 'dummy://'
-CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
-SESSION_ENGINE = 'django.contrib.sessions.backends.db'
-
-APP_URL = 'http://' #used by email notif system and RSS
-
-#LOCALIZATIONS
-TIME_ZONE = 'America/New_York'
-
-###########################
-#
-#   this will allow running your forum with url like http://site.com/forum
-#
-#   FORUM_SCRIPT_ALIAS = 'forum/'
-#
-FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-
-
-#OTHER SETTINGS
-
-USE_I18N = False
-LANGUAGE_CODE = 'en'
+app_url_split = APP_URL.split("://")
 
-EMAIL_VALIDATION = 'off' #string - on|off
+APP_PROTOCOL = app_url_split[0]
+APP_DOMAIN = app_url_split[1].split('/')[0]
+APP_BASE_URL = '%s://%s' % (APP_PROTOCOL, APP_DOMAIN)
 
-DJANGO_VERSION = 1.1
-RESOURCE_REVISION=4
-OSQA_DEFAULT_SKIN = 'default'
+FORCE_SCRIPT_NAME = ''
 
-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']
+for path in app_url_split[1].split('/')[1:]:
+    FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME + '/' + path
 
+if FORCE_SCRIPT_NAME.endswith('/'):
+    FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME[:-1]
 
 INSTALLED_APPS = [
     'django.contrib.auth',
@@ -170,6 +113,3 @@ if not DEBUG:
         pass
 
 AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]
-
-
-