diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
tree | 81e17d84530990e35a0accba3a7886266a601482 /settings_local.py.dist | |
parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'settings_local.py.dist')
-rw-r--r-- | settings_local.py.dist | 79 |
1 files changed, 74 insertions, 5 deletions
diff --git a/settings_local.py.dist b/settings_local.py.dist index 003c7491..136d4bdd 100644 --- a/settings_local.py.dist +++ b/settings_local.py.dist @@ -1,17 +1,39 @@ # encoding:utf-8 import os.path +<<<<<<< HEAD:settings_local.py.dist +======= +from django.utils.translation import ugettext as _ + +>>>>>>> evgenyfadeev/master:settings_local.py.dist SITE_SRC_ROOT = os.path.dirname(__file__) LOG_FILENAME = 'django.lanai.log' #for logging import logging logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,) +<<<<<<< HEAD:settings_local.py.dist DATABASE_NAME = '' # Or path to database file if using sqlite3. DATABASE_USER = '' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_ENGINE = '' #mysql, etc <<<<<<< HEAD:settings_local.py.dist +======= + +#ADMINS and MANAGERS +ADMINS = (('Forum Admin', 'forum@example.com'),) +MANAGERS = ADMINS + +#DEBUG SETTINGS +DEBUG = False +TEMPLATE_DEBUG = DEBUG +INTERNAL_IPS = ('127.0.0.1',) + +DATABASE_NAME = 'cnprog' # Or path to database file if using sqlite3. +DATABASE_USER = '' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_ENGINE = 'mysql' #mysql, etc +>>>>>>> evgenyfadeev/master:settings_local.py.dist #Moved from settings.py for better organization. (please check it up to clean up settings.py) @@ -22,18 +44,33 @@ DATABASE_ENGINE = '' #mysql, etc >>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist #email server settings SERVER_EMAIL = '' -DEFAULT_FROM_EMAIL = 'team@cnprog.com' +DEFAULT_FROM_EMAIL = '' EMAIL_HOST_USER = '' EMAIL_HOST_PASSWORD = '' +<<<<<<< HEAD:settings_local.py.dist EMAIL_SUBJECT_PREFIX = '[cnprog.com]' EMAIL_HOST='smtp.gmail.com' EMAIL_PORT='587' EMAIL_USE_TLS=True <<<<<<< HEAD:settings_local.py.dist +======= +EMAIL_SUBJECT_PREFIX = '[CNPROG] ' +EMAIL_HOST='cnprog.com' +EMAIL_PORT='25' +EMAIL_USE_TLS=False +>>>>>>> evgenyfadeev/master:settings_local.py.dist #LOCALIZATIONS -TIME_ZONE = 'Asia/Chongqing Asia/Chungking' -# LANGUAGE_CODE = 'en-us' +TIME_ZONE = 'America/Tijuana' + +########################### +# +# 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 + ======= @@ -43,26 +80,58 @@ TIME_ZONE = 'Asia/Chongqing Asia/Chungking' >>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist #OTHER SETTINGS +<<<<<<< HEAD:settings_local.py.dist APP_TITLE = u'CNProg.com 程序员问答社区' APP_KEYWORDS = u'技术问答社区,中国程序员,编程技术社区,程序员社区,程序员论坛,程序员wiki,程序员博客' APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。' APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题,给予您的宝贵答案。</p>' APP_COPYRIGHT = 'Copyright CNPROG.COM 2009' <<<<<<< HEAD:settings_local.py.dist +======= +APP_TITLE = u'CNPROG Q&A Forum' +APP_KEYWORDS = u'CNPROG,forum,community' +APP_DESCRIPTION = u'Ask and answer questions.' +APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>' +APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.' +LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/') +GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc +>>>>>>> evgenyfadeev/master:settings_local.py.dist ======= >>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist USE_I18N = True LANGUAGE_CODE = 'en' -EMAIL_VALIDATION = 'off' +EMAIL_VALIDATION = 'off' #string - on|off MIN_USERNAME_LENGTH = 1 EMAIL_UNIQUE = False -APP_URL = 'http://server.com' #used by email notif system and RSS +APP_URL = 'http://cnprog.com' #used by email notif system and RSS GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=' <<<<<<< HEAD:settings_local.py.dist GOOGLE_ANALYTICS_KEY = '' +<<<<<<< HEAD:settings_local.py.dist BOOKS_ON = True ======= GOOGLE_ANALYTICS_KEY = '' >>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist +======= +BOOKS_ON = False +WIKI_ON = True +USE_EXTERNAL_LEGACY_LOGIN = False +EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com' +EXTERNAL_LEGACY_LOGIN_PORT = 80 +EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>' +FEEDBACK_SITE_URL = None #None or url + +DJANGO_VERSION = 1.1 +RESOURCE_REVISION=4 + +USE_SPHINX_SEARCH = True #if True all SPHINX_* settings are required +#also sphinx search engine and djangosphinxs app must be installed +#sample sphinx configuration file is /sphinx/sphinx.conf +SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation +SPHINX_SEARCH_INDICES=('cnprog',) #a tuple of index names remember about a comma after the +#last item, especially if you have just one :) +SPHINX_SERVER='localhost' +SPHINX_PORT=3312 +>>>>>>> evgenyfadeev/master:settings_local.py.dist |