Update settings.

This commit is contained in:
Kevin Fenzi 2014-01-09 20:21:20 +00:00
parent 9f3511ff1d
commit 0d1addb56e

View file

@ -25,9 +25,9 @@ DATABASES = {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'askfedora',
'USER': 'askfedora', # Not used with sqlite3.
'PASSWORD': '<%= askbotDBPassword %>', # Not used with sqlite3.
'PASSWORD': '{{ askbotDBPassword }}', # Not used with sqlite3.
{% if env == "staging" %}
'HOST' : 'db01',
'HOST' : 'db02.stg',
{% else %}
'HOST' : 'db-ask',
{% endif %}
@ -277,6 +277,7 @@ RECAPTCHA_USE_SSL = True
#HAYSTACK_SETTINGS
ENABLE_HAYSTACK_SEARCH = False
HAYSTACK_SITECONF = "askbot.search.haystack"
#Uncomment for multilingual setup:
#HAYSTACK_ROUTERS = ['askbot.search.haystack.routers.LanguageRouter',]
@ -293,6 +294,7 @@ TINYMCE_COMPRESSOR = True
TINYMCE_SPELLCHECKER = False
TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/')
#TINYMCE_JS_URL = STATIC_URL + 'default/media/js/tinymce/tiny_mce.js'
TINYMCE_URL = STATIC_URL + 'default/media/js/tinymce/'
TINYMCE_DEFAULT_CONFIG = {
'plugins': 'askbot_imageuploader,askbot_attachment',
'convert_urls': False,