From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 2 Jun 2010 23:05:38 +0000 (+0000)
Subject: Rollback some changes commited by mistake.
X-Git-Tag: live~773
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/40919e42c1f104b8e5fcdfdafcf87beba2cd4bda

Rollback some changes commited by mistake.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@359 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/settings.py b/settings.py
index 2cf11e9..a7c5893 100644
--- a/settings.py
+++ b/settings.py
@@ -56,85 +56,8 @@ ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
 # unit byte
 ALLOW_MAX_FILE_SIZE = 1024 * 1024
 
-
-
-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'
-
-EMAIL_VALIDATION = 'off' #string - on|off
-
-DJANGO_VERSION = 1.1
-RESOURCE_REVISION=4
-OSQA_DEFAULT_SKIN = 'default'
-
-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']
-
+# User settings
+from settings_local import *
 
 INSTALLED_APPS = [
     'django.contrib.auth',
@@ -170,6 +93,3 @@ if not DEBUG:
         pass
 
 AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]
-
-
-