diff --git a/.env b/.env index 60ae277..edcf062 100644 --- a/.env +++ b/.env @@ -54,13 +54,13 @@ ADMIN_FRONTEND_SSH_USER=root ADMIN_FRONTEND_SSH_PORT=22 ADMIN_FRONTEND_SSH_USE_SUDO=0 ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin -ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site +ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site/yumiadmin-acc ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml ADMIN_FRONTEND_COMPOSE_SERVICE=caddy ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next ADMIN_FRONTEND_DIST_DIR=apps/dist -ADMIN_FRONTEND_PUBLIC_URL=https://yumi-admin.haiyihy.com +ADMIN_FRONTEND_PUBLIC_URL=https://yumiadmin-acc.global-interaction.com CHATAPP_CRON_ENABLED=1 CHATAPP_CRON_REPO_URL=git@gitea.haiyihy.com:hy/chatapp-cron.git CHATAPP_CRON_REPO_ROOT=/opt/deploy/sources/chatapp-cron diff --git a/.env.example b/.env.example index 7abbe22..b411392 100644 --- a/.env.example +++ b/.env.example @@ -67,13 +67,13 @@ ADMIN_FRONTEND_SSH_USER=root ADMIN_FRONTEND_SSH_PORT=22 ADMIN_FRONTEND_SSH_USE_SUDO=0 ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin -ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site +ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site/yumiadmin-acc ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml ADMIN_FRONTEND_COMPOSE_SERVICE=caddy ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next ADMIN_FRONTEND_DIST_DIR=apps/dist -ADMIN_FRONTEND_PUBLIC_URL=https://yumi-admin.haiyihy.com +ADMIN_FRONTEND_PUBLIC_URL=https://yumiadmin-acc.global-interaction.com CHATAPP_CRON_ENABLED=1 CHATAPP_CRON_REPO_URL=git@gitea.haiyihy.com:hy/chatapp-cron.git CHATAPP_CRON_REPO_ROOT=/opt/deploy/sources/chatapp-cron diff --git a/README.md b/README.md index e4f05ff..223b70a 100644 --- a/README.md +++ b/README.md @@ -111,13 +111,13 @@ ADMIN_FRONTEND_SSH_HOST=10.2.1.2 ADMIN_FRONTEND_SSH_USER=root ADMIN_FRONTEND_SSH_PORT=22 ADMIN_FRONTEND_REMOTE_DIR=/opt/yumi-admin/frontend-admin -ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site +ADMIN_FRONTEND_SITE_DIR=/opt/yumi-admin/frontend-admin/site/yumiadmin-acc ADMIN_FRONTEND_COMPOSE_FILE=/opt/yumi-admin/frontend-admin/docker-compose.yml ADMIN_FRONTEND_COMPOSE_SERVICE=caddy ADMIN_FRONTEND_RELEASE_META_PATH=/opt/yumi-admin/frontend-admin/.hy-app-monitor-admin-release.json ADMIN_FRONTEND_BUILD_SCRIPT=build:antdv-next ADMIN_FRONTEND_DIST_DIR=apps/dist -ADMIN_FRONTEND_PUBLIC_URL=https://yumi-admin.haiyihy.com +ADMIN_FRONTEND_PUBLIC_URL=https://yumiadmin-acc.global-interaction.com ``` 通用模块里的 `Cron 部署` 用于发布 `chatapp-cron`,需要目标机已有 `docker-compose.yml` 和 `service.env`。部署流程会构建 `week-star-job` 二进制,上传到目标机,再执行 compose 重建: diff --git a/core/config.py b/core/config.py index cceda76..60acb12 100644 --- a/core/config.py +++ b/core/config.py @@ -265,10 +265,10 @@ ADMIN_FRONTEND_SSH_PORT = env_int("ADMIN_FRONTEND_SSH_PORT", SSH_PORT) ADMIN_FRONTEND_SSH_USE_SUDO = env_str("ADMIN_FRONTEND_SSH_USE_SUDO", "0").lower() in {"1", "true", "yes", "on"} # Admin 前端远端运行目录。 ADMIN_FRONTEND_REMOTE_DIR = env_str("ADMIN_FRONTEND_REMOTE_DIR", "/opt/yumi-admin/frontend-admin").strip() or "/opt/yumi-admin/frontend-admin" -# Admin 前端静态站点目录。 +# Admin 前端静态站点目录;chatapp3 admin 只发布到 yumiadmin-acc 子站,不占用 Caddy 根目录。 ADMIN_FRONTEND_SITE_DIR = ( - env_str("ADMIN_FRONTEND_SITE_DIR", f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site").strip() - or f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site" + env_str("ADMIN_FRONTEND_SITE_DIR", f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site/yumiadmin-acc").strip() + or f"{ADMIN_FRONTEND_REMOTE_DIR.rstrip('/')}/site/yumiadmin-acc" ) # Admin 前端 compose 文件路径。 ADMIN_FRONTEND_COMPOSE_FILE = ( diff --git a/localbox/.env.local b/localbox/.env.local index bc34c34..b83165d 100644 --- a/localbox/.env.local +++ b/localbox/.env.local @@ -156,7 +156,7 @@ LIKEI_EXTERNAL_LOCAL_DISK_READ_COMPAT=false LIKEI_EXTERNAL_OSS_MODE=tencent-cos LIKEI_FRAMEWORK_NACOS_STOP_KEY=CxILm9hA1b9hF3Hl LIKEI_FRONTEND_ADMIN_CONSOLE_UPSTREAM=10.2.1.16:2700 -LIKEI_FRONTEND_ADMIN_DOMAIN=yumi-admin.haiyihy.com +LIKEI_FRONTEND_ADMIN_DOMAIN=yumiadmin-acc.global-interaction.com LIKEI_FRONTEND_ADMIN_GOLANG_UPSTREAM=10.2.1.16:2900 LIKEI_FRONTEND_ADMIN_INSTANCE_ID=ins-p11begwe LIKEI_GAME_BAISHUN2FUN_APP_CHANNEL=lotfun diff --git a/tests/test_service_release.py b/tests/test_service_release.py index c972bbb..9ed8a44 100644 --- a/tests/test_service_release.py +++ b/tests/test_service_release.py @@ -180,7 +180,7 @@ class ServiceReleaseTargetsTests(unittest.TestCase): @patch("monitors.yumi.service_release.ADMIN_FRONTEND_IP", "10.2.1.2") @patch("monitors.yumi.service_release.ADMIN_FRONTEND_HOST", "admin-platform") @patch("monitors.yumi.service_release.ADMIN_FRONTEND_REPO_URL", "git@example.com:hy/chatapp3-admin.git") - @patch("monitors.yumi.service_release.ADMIN_FRONTEND_SITE_DIR", "/opt/yumi-admin/frontend-admin/site") + @patch("monitors.yumi.service_release.ADMIN_FRONTEND_SITE_DIR", "/opt/yumi-admin/frontend-admin/site/yumiadmin-acc") @patch("monitors.yumi.service_release.frontend_release_enabled", return_value=True) @patch( "monitors.yumi.service_release.frontend_release_display",