QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 16:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

规范配置文件写法；数据库用户名也在环境变量中取

Browse Source
This commit is contained in:
virusdefender 2015-12-10 19:29:21 +08:00
parent 0af8b80b01
commit b973dfdfda
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oj/server_settings.py
View File

@ -11,7 +11,7 @@ DATABASES = {
'CONN_MAX_AGE': 0.1, 'CONN_MAX_AGE': 0.1,
'HOST': os.environ.get("MYSQL_PORT_3306_TCP_ADDR", "127.0.0.1"), 'HOST': os.environ.get("MYSQL_PORT_3306_TCP_ADDR", "127.0.0.1"),
'PORT': 3306, 'PORT': 3306,
'USER': 'root', 'USER': os.environ.get("MYSQL_ENV_MYSQL_USER", "root"),
'PASSWORD': os.environ.get("MYSQL_ENV_MYSQL_ROOT_PASSWORD", "root") 'PASSWORD': os.environ.get("MYSQL_ENV_MYSQL_ROOT_PASSWORD", "root")
}, },
'submission': { 'submission': {
@ -20,7 +20,7 @@ DATABASES = {
'CONN_MAX_AGE': 0.1, 'CONN_MAX_AGE': 0.1,
'HOST': os.environ.get("MYSQL_PORT_3306_TCP_ADDR", "127.0.0.1"), 'HOST': os.environ.get("MYSQL_PORT_3306_TCP_ADDR", "127.0.0.1"),
'PORT': 3306, 'PORT': 3306,
'USER': 'root', 'USER': os.environ.get("MYSQL_ENV_MYSQL_USER", "root"),
'PASSWORD': os.environ.get("MYSQL_ENV_MYSQL_ROOT_PASSWORD", "root") 'PASSWORD': os.environ.get("MYSQL_ENV_MYSQL_ROOT_PASSWORD", "root")
} }
} }
@ -37,7 +37,6 @@ REDIS_QUEUE = {
"db": 2 "db": 2
} }
DEBUG = False DEBUG = False
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']

6
oj/settings.py
View File

@ -22,7 +22,6 @@ if ENV == "local":
elif ENV == "server": elif ENV == "server":
from .server_settings import * from .server_settings import *
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@ -187,19 +186,16 @@ WEBSITE_INFO = {"website_name": "qduoj",
"website_footer": u"青岛大学信息工程学院 创新实验室 <a href=\"http://www.miibeian.gov.cn/\">京ICP备15062075号-1</a>", "website_footer": u"青岛大学信息工程学院 创新实验室 <a href=\"http://www.miibeian.gov.cn/\">京ICP备15062075号-1</a>",
"url": "https://qduoj.com"} "url": "https://qduoj.com"}
HUEY = { HUEY = {
'backend': 'huey.backends.redis_backend', 'backend': 'huey.backends.redis_backend',
'name': 'task_queue', 'name': 'task_queue',
'connection': {'host': REDIS_QUEUE["host"], 'port': REDIS_QUEUE["port"], 'db': REDIS_QUEUE["db"]}, 'connection': {'host': REDIS_QUEUE["host"], 'port': REDIS_QUEUE["port"], 'db': REDIS_QUEUE["db"]},
'always_eager': False, # Defaults to False when running via manage.py run_huey 'always_eager': False, # Defaults to False when running via manage.py run_huey
# Options to pass into the consumer when running ``manage.py run_huey`` # Options to pass into the consumer when running ``manage.py run_huey``
'consumer_options': {'workers': 50}, 'consumer_options': {'workers': 50},
} }
SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com", SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
"email": "noreply@qduoj.com", "email": "noreply@qduoj.com",
"password": os.environ.get("smtp_password", "111111"), "password": os.environ.get("smtp_password", "111111"),
"tls": False} "tls": False}