From 0218bec7039cd802f3d0d8b44c3f8ca4155a4e94 Mon Sep 17 00:00:00 2001 From: naiba Date: Fri, 27 May 2022 09:51:03 +0800 Subject: [PATCH] `installer v0.10.3` [no ci] --- README.md | 2 +- script/config.yaml | 2 +- script/install.sh | 4 ++-- script/install_en.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 00a44b6..bfce47f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: Nezha Monitoring: Self-hosted, lightweight server and website monitoring and O&M tool.

diff --git a/script/config.yaml b/script/config.yaml index 5bfa0b5..de900d7 100644 --- a/script/config.yaml +++ b/script/config.yaml @@ -3,7 +3,7 @@ httpport: 80 language: nz_language grpcport: nz_grpc_port oauth2: - type: "nz_oauth2_type" #Oauth2 登录接入类型，gitee/github + type: "nz_oauth2_type" #Oauth2 登录接入类型，github/gitlab/jihulab/gitee admin: "nz_admin_logins" #管理员列表，半角逗号隔开 clientid: "nz_github_oauth_client_id" # 在 https://github.com/settings/developers 创建，无需审核 Callback 填 http(s)://域名或IP/oauth2/callback clientsecret: "nz_github_oauth_client_secret" diff --git a/script/install.sh b/script/install.sh index 50fa537..07bc863 100755 --- a/script/install.sh +++ b/script/install.sh @@ -11,7 +11,7 @@ NZ_BASE_PATH="/opt/nezha" NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard" NZ_AGENT_PATH="${NZ_BASE_PATH}/agent" NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service" -NZ_VERSION="v0.10.2" +NZ_VERSION="v0.10.3" red='\033[0;31m' green='\033[0;32m' @@ -325,7 +325,7 @@ modify_dashboard_config() { echo "关于 GitHub Oauth2 应用：在 https://github.com/settings/developers 创建，无需审核，Callback 填 http(s)://域名或IP/oauth2/callback" && echo "关于 Gitee Oauth2 应用：在 https://gitee.com/oauth/applications 创建，无需审核，Callback 填 http(s)://域名或IP/oauth2/callback" && - read -ep "请输入 OAuth2 提供商(gitee/github，默认 github): " nz_oauth2_type && + read -ep "请输入 OAuth2 提供商(github/gitlab/jihulab/gitee，默认 github): " nz_oauth2_type && read -ep "请输入 Oauth2 应用的 Client ID: " nz_github_oauth_client_id && read -ep "请输入 Oauth2 应用的 Client Secret: " nz_github_oauth_client_secret && read -ep "请输入 GitHub/Gitee 登录名作为管理员，多个以逗号隔开: " nz_admin_logins && diff --git a/script/install_en.sh b/script/install_en.sh index 5b1d9b9..f430229 100755 --- a/script/install_en.sh +++ b/script/install_en.sh @@ -11,7 +11,7 @@ NZ_BASE_PATH="/opt/nezha" NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard" NZ_AGENT_PATH="${NZ_BASE_PATH}/agent" NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service" -NZ_VERSION="v0.10.2" +NZ_VERSION="v0.10.3" red='\033[0;31m' green='\033[0;32m' @@ -294,7 +294,7 @@ modify_dashboard_config() { echo "About the GitHub Oauth2 application: create it at https://github.com/settings/developers, no review required, and fill in the http(s)://domain_or_IP/oauth2/callback" && echo "(Not recommended) About the Gitee Oauth2 application: create it at https://gitee.com/oauth/applications, no auditing required, and fill in the http(s)://domain_or_IP/oauth2/callback" && - read -ep "Please enter the OAuth2 provider (gitee/github, default github): " nz_oauth2_type && + read -ep "Please enter the OAuth2 provider (github/gitlab/jihulab/gitee, default github): " nz_oauth2_type && read -ep "Please enter the Client ID of the Oauth2 application: " nz_github_oauth_client_id && read -ep "Please enter the Client Secret of the Oauth2 application: " nz_github_oauth_client_secret && read -ep "Please enter your GitHub/Gitee login name as the administrator, separated by commas: " nz_admin_logins &&