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

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

View File

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

View File

@ -22,7 +22,6 @@ if ENV == "local":
elif ENV == "server":
from .server_settings import *
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@ -187,7 +186,6 @@ WEBSITE_INFO = {"website_name": "qduoj",
"website_footer": u"青岛大学信息工程学院 创新实验室 <a href=\"http://www.miibeian.gov.cn/\">京ICP备15062075号-1</a>",
"url": "https://qduoj.com"}
HUEY = {
'backend': 'huey.backends.redis_backend',
'name': 'task_queue',
@ -197,9 +195,7 @@ HUEY = {
'consumer_options': {'workers': 50},
}
SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
"email": "noreply@qduoj.com",
"password": os.environ.get("smtp_password", "111111"),
"tls": False}