[ agent ] 优化部分内容
This commit is contained in:
@@ -34,6 +34,59 @@ is_remove_agent=0
|
||||
is_offline=0
|
||||
# 脚本执行内容
|
||||
|
||||
|
||||
#######################################
|
||||
# description
|
||||
# Arguments:
|
||||
# None
|
||||
#######################################
|
||||
help() {
|
||||
|
||||
local call_script_command="source <(curl -sL https://oss-s1.107421.xyz/init-script-wdd.sh)"
|
||||
|
||||
local only_ssh_init_command="$call_script_command --ssh-login --ssh-port 22333 --firewall "
|
||||
|
||||
local base_init_command="$only_ssh_init_command --tools --host --zsh"
|
||||
|
||||
cat - 1>&2 <<EOF
|
||||
|
||||
# 打印使用说明
|
||||
$call_script_command --help
|
||||
|
||||
# 修改sshd的端口的命令
|
||||
$only_ssh_init_command
|
||||
|
||||
# 安装docker docker-compose的初始化
|
||||
$base_init_command --docker 20.10.10 --docker-compose --cn
|
||||
|
||||
# 不安装docker的初始化
|
||||
$base_init_command --cn
|
||||
|
||||
# 启动 Octopus Agent
|
||||
$base_init_command --agent-install
|
||||
|
||||
-h, --help 打印本说明文档
|
||||
--firewall 关闭防火墙
|
||||
--swap 关闭Swap
|
||||
--url 脚本的OSS URL地址
|
||||
--tools 安装通用的实用工具
|
||||
--docker <version> 安装docker 版本<version>
|
||||
--docker-compose 安装docker-compose 2.18.0
|
||||
--zsh 安装并且配置ZSH
|
||||
--cn 是否在国内安装
|
||||
--offline 是否是纯离线安装
|
||||
--host 是否配置服务器的Host解析
|
||||
--time 是否配置时间同步
|
||||
--ssh-login 修改ssh的登录密钥
|
||||
--ssh-port <port> 修改ssh的登录端口 端口 <port>
|
||||
|
||||
--agent-install 安装 Octopus-Agent
|
||||
--agent-install 更新 Octopus-Agent
|
||||
--agent-remove 卸载 Octopus-Agent
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
# read config
|
||||
#########################
|
||||
while [[ $# -gt 0 ]]; do
|
||||
@@ -1131,17 +1184,6 @@ EOF
|
||||
colorEchoBlue "[install_octopus_agent] - offline agent url are => $octopus_agent_url"
|
||||
fi
|
||||
|
||||
# local octopus_latest_version=""
|
||||
# octopus_latest_version=$(curl "$octopus_agent_url/" | grep -v h1 | grep "a href=" | head -1 | awk '{print$2}' | cut -d">" -f2 | cut -d"<" -f1 | cut -d"_" -f4-)
|
||||
#
|
||||
# log "查询得到的Octopus Agent的最新版本为 => ${octopus_latest_version}"
|
||||
# if [[ $latest_version == "" ]]; then
|
||||
# echo ""
|
||||
# colorEchoRed "[update_octopus_agent] - get agent version error ! break !"
|
||||
# colorEchoRed "[update_octopus_agent] - get agent version error ! break !"
|
||||
# echo ""
|
||||
# return 233
|
||||
# fi
|
||||
get_octopus_agent_latest_version
|
||||
|
||||
SplitBlue
|
||||
@@ -1225,57 +1267,7 @@ build_offline_host_ip(){
|
||||
FunctionEnd
|
||||
}
|
||||
|
||||
#######################################
|
||||
# description
|
||||
# Arguments:
|
||||
# None
|
||||
#######################################
|
||||
help() {
|
||||
|
||||
local call_script_command="source <(curl -sL https://oss-s1.107421.xyz/init-script-wdd.sh)"
|
||||
|
||||
local only_ssh_init_command="$call_script_command --ssh-login --ssh-port 22333 --firewall "
|
||||
|
||||
local base_init_command="$only_ssh_init_command --tools --host --zsh"
|
||||
|
||||
cat - 1>&2 <<EOF
|
||||
|
||||
# 打印使用说明
|
||||
$call_script_command --help
|
||||
|
||||
# 修改sshd的端口的命令
|
||||
$only_ssh_init_command
|
||||
|
||||
# 安装docker docker-compose的初始化
|
||||
$base_init_command --docker 20.10.10 --docker-compose --cn
|
||||
|
||||
# 不安装docker的初始化
|
||||
$base_init_command --cn
|
||||
|
||||
# 启动 Octopus Agent
|
||||
$base_init_command --agent-install
|
||||
|
||||
-h, --help 打印本说明文档
|
||||
--firewall 关闭防火墙
|
||||
--swap 关闭Swap
|
||||
--url 脚本的OSS URL地址
|
||||
--tools 安装通用的实用工具
|
||||
--docker <version> 安装docker 版本<version>
|
||||
--docker-compose 安装docker-compose 2.18.0
|
||||
--zsh 安装并且配置ZSH
|
||||
--cn 是否在国内安装
|
||||
--offline 是否是纯离线安装
|
||||
--host 是否配置服务器的Host解析
|
||||
--time 是否配置时间同步
|
||||
--ssh-login 修改ssh的登录密钥
|
||||
--ssh-port <port> 修改ssh的登录端口 端口 <port>
|
||||
|
||||
--agent-install 安装 Octopus-Agent
|
||||
--agent-install 更新 Octopus-Agent
|
||||
--agent-remove 卸载 Octopus-Agent
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -161,10 +161,15 @@ proxy-groups:
|
||||
- Phoenix-Trojan
|
||||
- Seoul-arm64-01-Trojan
|
||||
- Tencent-HK-11.24
|
||||
- name: 💩 工作环境
|
||||
- name: 💩 工作直连
|
||||
type: select
|
||||
proxies:
|
||||
- DIRECT
|
||||
- name: 💩 工作代理
|
||||
type: select
|
||||
proxies:
|
||||
- onetools-35-71
|
||||
- DIRECT
|
||||
- name: 🎯 全球直连
|
||||
type: select
|
||||
proxies:
|
||||
@@ -197,10 +202,12 @@ proxy-groups:
|
||||
- Seoul-arm64-01-Trojan
|
||||
- Tencent-HK-11.24
|
||||
rules:
|
||||
- DOMAIN-SUFFIX,uavcmlc.com,💩 工作环境
|
||||
- DOMAIN-SUFFIX,cdcyy.cn,💩 工作环境
|
||||
- DOMAIN-SUFFIX,hq.cmcc,💩 工作环境
|
||||
- DOMAIN-SUFFIX,ecs.io,💩 工作环境
|
||||
- DOMAIN-SUFFIX,cdcyy.cn,💩 工作直连
|
||||
- DOMAIN-SUFFIX,hq.cmcc,💩 工作直连
|
||||
- DOMAIN-SUFFIX,wdd.io,💩 工作直连
|
||||
- DOMAIN-SUFFIX,harbor.cdcyy.com.cn,💩 工作代理
|
||||
- DOMAIN-SUFFIX,ecs.io,💩 工作代理
|
||||
- DOMAIN-SUFFIX,ops.uavcmlc.com,💩 工作代理
|
||||
- DOMAIN-SUFFIX,acl4.ssr,🎯 全球直连
|
||||
- DOMAIN-SUFFIX,ip6-localhost,🎯 全球直连
|
||||
- DOMAIN-SUFFIX,ip6-loopback,🎯 全球直连
|
||||
|
||||
@@ -68,11 +68,10 @@
|
||||
"settings": {
|
||||
"servers": [
|
||||
{
|
||||
"address": "140.238.14.103",
|
||||
"method": "chacha20",
|
||||
"address": "89.208.251.209",
|
||||
"ota": false,
|
||||
"password": "V2ryStr0ngP0ss",
|
||||
"port": 443,
|
||||
"password": "v2ryStr@ngPa.ss",
|
||||
"port": 29999,
|
||||
"level": 1
|
||||
}
|
||||
]
|
||||
@@ -82,7 +81,7 @@
|
||||
"security": "tls",
|
||||
"tlsSettings": {
|
||||
"allowInsecure": false,
|
||||
"serverName": "xx.s4.cc.hh.107421.xyz",
|
||||
"serverName": "xx.l4.cc.nn.107421.xyz",
|
||||
"show": false
|
||||
}
|
||||
},
|
||||
|
||||
@@ -12,4 +12,4 @@ services:
|
||||
- ANTHROPIC_API_VERSION=3
|
||||
- CODE=lovemm.23
|
||||
- HIDE_USER_API_KEY=1
|
||||
- CUSTOM_MODELS=-gpt-4,-gpt-4-0613,-gpt-4-32k,-gpt-4-32k-0613,-gpt-4-turbo,-gpt-4-turbo-preview,-gpt-4-turbo-2024-04-09,-gpt-3.5-turbo-1106,-gpt-4-vision-preview,-claude-instant-1.2,-claude-2.0,-claude-2.1,-claude-3-haiku-20240307,-gemini-pro-vision,-gemini-1.0-pro,-gpt-4-turbo-2024-04-09
|
||||
- CUSTOM_MODELS=-gpt-4,-gpt-4-0613,-gpt-4-32k,-gpt-4-32k-0613,-gpt-4-turbo,-gpt-4-turbo-preview,-gpt-4-turbo-2024-04-09,-gpt-3.5-turbo-1106,-gpt-4-vision-preview,-claude-instant-1.2,-claude-2.0,-claude-2.1,-claude-3-haiku-20240307,-gemini-pro-vision,-gemini-1.0-pro,-gpt-4-turbo-2024-04-09,+gpt-4o-mini
|
||||
Reference in New Issue
Block a user