From c6e7abe53dcc29423bca1d6486eef45d25148a76 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Fri, 8 Jan 2016 23:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E7=A7=BB=E5=85=A5=20*=5Fsettings.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
oj/local_settings.py | 11 +++++++++++
oj/server_settings.py | 10 ++++++++++
oj/settings.py | 9 ---------
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/oj/local_settings.py b/oj/local_settings.py
index 8fa3b8a..42b9b5f 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -46,3 +46,14 @@ STATICFILES_DIRS = [os.path.join(BASE_DIR, "static/src/"), BASE_DIR]
TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'template/src/')]
SSO = {"callback": "http://localhost:8765/login"}
+
+WEBSITE_INFO = {"website_name": "qduoj",
+ "website_footer": u"青岛大学信息工程学院 创新实验室 京ICP备15062075号-1",
+ "url": "https://qduoj.com"}
+
+
+SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
+ "email": "noreply@qduoj.com",
+ "password": os.environ.get("smtp_password", "111111"),
+ "tls": False}
+
diff --git a/oj/server_settings.py b/oj/server_settings.py
index 98eae98..9eb1416 100644
--- a/oj/server_settings.py
+++ b/oj/server_settings.py
@@ -57,3 +57,13 @@ TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'template/release/')]
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SSO = {"callback": "https://discuss.acmer.site/login"}
+
+WEBSITE_INFO = {"website_name": "qduoj",
+ "website_footer": u"青岛大学信息工程学院 创新实验室 京ICP备15062075号-1",
+ "url": "https://qduoj.com"}
+
+
+SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
+ "email": "noreply@qduoj.com",
+ "password": os.environ.get("smtp_password", "111111"),
+ "tls": False}
diff --git a/oj/settings.py b/oj/settings.py
index 97424d0..bc87af4 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -185,12 +185,3 @@ TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'upload/')
-WEBSITE_INFO = {"website_name": "qduoj",
- "website_footer": u"青岛大学信息工程学院 创新实验室 京ICP备15062075号-1",
- "url": "https://qduoj.com"}
-
-
-SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
- "email": "noreply@qduoj.com",
- "password": os.environ.get("smtp_password", "111111"),
- "tls": False}