Adds the user menu to the injectable places, makes several improvements in the user...

[osqa.git] / settings_local.py.dist

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 34c706e3f8ed355ec6525be77dc87062178415d7..8f997e5253a1c2082b6790ec867d87f936fcf8ef 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,13 +1,5 @@
 # encoding:utf-8
 import os.path
 # encoding:utf-8
 import os.path

-from django.utils.translation import ugettext as _
-
-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'
 
 SITE_SRC_ROOT = os.path.dirname(__file__)
 LOG_FILENAME = 'django.osqa.log'


@@ -16,21 +8,22 @@ LOG_FILENAME = 'django.osqa.log'
 import logging
 logging.basicConfig(
     filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
 import logging
 logging.basicConfig(
     filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),

-    level=logging.DEBUG,
+    level=logging.ERROR,

     format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
 )
 
 #ADMINS and MANAGERS
     format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
 )
 
 #ADMINS and MANAGERS

-ADMINS = (('Forum Admin', 'forum@example.com'),)
+ADMINS = ()

 MANAGERS = ADMINS
 
 MANAGERS = ADMINS
 

-DEBUG = True
+DEBUG = False

 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': True
 }
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': True
 }
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 

+

 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.


@@ -38,9 +31,9 @@ DATABASE_ENGINE = ''  #mysql, etc
 DATABASE_HOST = ''
 DATABASE_PORT = ''
 
 DATABASE_HOST = ''
 DATABASE_PORT = ''
 

-#CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
-CACHE_BACKEND = 'dummy://'
-#SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
+CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
+#CACHE_BACKEND = 'dummy://'
+SESSION_ENGINE = 'django.contrib.sessions.backends.db'

 
 APP_URL = 'http://' #used by email notif system and RSS
 
 
 APP_URL = 'http://' #used by email notif system and RSS
 


@@ -60,19 +53,8 @@ FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'

-EMAIL_VALIDATION = 'off' #string - on|off
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-
-WIKI_ON = True
-FEEDBACK_SITE_URL = None #None or url
-EDITABLE_SCREEN_NAME = False #True or False - can user change screen name?

 
 DJANGO_VERSION = 1.1
 
 DJANGO_VERSION = 1.1

-RESOURCE_REVISION=4
-

 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']
 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']

-
-from forum.settings import *
\ No newline at end of file