Skip to content

Commit 7476c73

Browse files
authored
Merge pull request #628 from Lingghh/dev/support_https_config
🎨优化main服务的https拉取代码开关配置
2 parents 74d5800 + e5cf632 commit 7476c73

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

scripts/config.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export TCA_APP_DATA_DIR=${TCA_APP_DATA_DIR}
3737
# Main工程配置
3838
## 框架配置
3939
export MAIN_DEBUG_MODE=true
40+
export HTTPS_CLONE_FLAG=
4041
export MAIN_SECRET_KEY='lh+6y8pyf16bbor*)p=kp=p(cg615+y+5nnin$l(n%os$8z^v%'
4142

4243
## 服务DB配置

server/configs/django/local_main.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
integrations=[DjangoIntegration(), CeleryIntegration()]
6565
)
6666

67+
# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
68+
# CodeDog运行环境配置
69+
# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
70+
HTTPS_CLONE_FLAG = True if os.environ.get("HTTPS_CLONE_FLAG") == "true" else False
71+
6772
# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
6873
# -*-*-*-*-*-*-*-*-*-*-*- 服务交互配置 -*-*-*-*-*-*-*-*-*-*-*-
6974
# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
@@ -107,4 +112,3 @@
107112
98nXivMpCDOeO3VC91Y8DU/9058smPswwr6kYFU/TZIDAUqb+H6T5DSbKnl7WZqx
108113
UdWbyBDJ9R9QeSy0owIDAQAB
109114
-----END PUBLIC KEY-----"""
110-

server/projects/main/codedog/settings/open_env.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
# Debug模式
2323
DEBUG = True if os.environ.get("MAIN_DEBUG_MODE") == "true" else False
2424

25-
# 代码库默认使用https
26-
HTTPS_CLONE_FLAG = True if os.environ.get("HTTPS_CLONE_FLAG") == "true" else False
27-
2825
ALLOWED_HOSTS = ["*"]
2926

3027
# 管理员列表
@@ -67,6 +64,11 @@
6764
integrations=[DjangoIntegration(), CeleryIntegration()]
6865
)
6966

67+
# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
68+
# CodeDog运行环境配置
69+
# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
70+
HTTPS_CLONE_FLAG = True if os.environ.get("HTTPS_CLONE_FLAG") == "true" else False
71+
7072
# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
7173
# -*-*-*-*-*-*-*-*-*-*-*- 服务交互配置 -*-*-*-*-*-*-*-*-*-*-*-
7274
# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-

0 commit comments

Comments
 (0)