Skip to content

Commit

Permalink
Merge pull request #628 from Lingghh/dev/support_https_config
Browse files Browse the repository at this point in the history
🎨优化main服务的https拉取代码开关配置
  • Loading branch information
cyw3 committed Sep 23, 2022
2 parents 74d5800 + e5cf632 commit 7476c73
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions scripts/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export TCA_APP_DATA_DIR=${TCA_APP_DATA_DIR}
# Main工程配置
## 框架配置
export MAIN_DEBUG_MODE=true
export HTTPS_CLONE_FLAG=
export MAIN_SECRET_KEY='lh+6y8pyf16bbor*)p=kp=p(cg615+y+5nnin$l(n%os$8z^v%'

## 服务DB配置
Expand Down
6 changes: 5 additions & 1 deletion server/configs/django/local_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
integrations=[DjangoIntegration(), CeleryIntegration()]
)

# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
# CodeDog运行环境配置
# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
HTTPS_CLONE_FLAG = True if os.environ.get("HTTPS_CLONE_FLAG") == "true" else False

# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
# -*-*-*-*-*-*-*-*-*-*-*- 服务交互配置 -*-*-*-*-*-*-*-*-*-*-*-
# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
Expand Down Expand Up @@ -107,4 +112,3 @@
98nXivMpCDOeO3VC91Y8DU/9058smPswwr6kYFU/TZIDAUqb+H6T5DSbKnl7WZqx
UdWbyBDJ9R9QeSy0owIDAQAB
-----END PUBLIC KEY-----"""

8 changes: 5 additions & 3 deletions server/projects/main/codedog/settings/open_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
# Debug模式
DEBUG = True if os.environ.get("MAIN_DEBUG_MODE") == "true" else False

# 代码库默认使用https
HTTPS_CLONE_FLAG = True if os.environ.get("HTTPS_CLONE_FLAG") == "true" else False

ALLOWED_HOSTS = ["*"]

# 管理员列表
Expand Down Expand Up @@ -67,6 +64,11 @@
integrations=[DjangoIntegration(), CeleryIntegration()]
)

# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
# CodeDog运行环境配置
# -*-*-*-*-*-*-*-*-*-*-*-*-*-*-
HTTPS_CLONE_FLAG = True if os.environ.get("HTTPS_CLONE_FLAG") == "true" else False

# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
# -*-*-*-*-*-*-*-*-*-*-*- 服务交互配置 -*-*-*-*-*-*-*-*-*-*-*-
# -*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*-*-
Expand Down

0 comments on commit 7476c73

Please sign in to comment.