Ver código fonte

修改哪吒安装方式,支持哪吒启用SSL/TLS加密方式

fscarmen 1 ano atrás
pai
commit
6cde92dd31
2 arquivos alterados com 14 adições e 7 exclusões
  1. 6 5
      README.md
  2. 8 2
      koyeb/startup.sh

+ 6 - 5
README.md

@@ -342,9 +342,10 @@ docker run -d --name freenom --restart always -v $(pwd):/conf -v $(pwd)/logs:/ap
 | TELEGRAM_BOT_TOKEN | 你的`Telegram bot`的`token` |  -  |  否   ||
 | TELEGRAM_BOT_ENABLE | 是否启用`Telegram Bot`推送功能 | `0` |  否   |    `1`:启用<br>`0`:不启用<br>默认不启用,如果设为`1`,则必须设置上面的`TELEGRAM_CHAT_ID`和`TELEGRAM_BOT_TOKEN`变量     |
 | NOTICE_FREQ | 通知频率 | `1` |  否   |                                 `0`:仅当有续期操作的时候<br>`1`:每次执行                                  |
-| NEZHA_SERVER | 哪吒探针服务端的 IP 或域名 |  -  |  否   |
-| NEZHA_PORT | 哪吒探针服务端的端口 |  -  |  否   |  
-| NEZHA_KEY | 哪吒探针客户端专用 Key |  -  |  否   |  
+| NEZHA_SERVER | 哪吒探针服务端的 IP 或域名 |  -  |  否   ||
+| NEZHA_PORT | 哪吒探针服务端的端口 |  -  |  否   ||
+| NEZHA_KEY | 哪吒探针客户端专用 Key |  -  |  否   ||
+| NEZHA_TLS | 哪吒客户SSL/TLS加密 |  -  |  否   |  `1`:启用<br>`0`:不启用  |
 
 **更多配置项含义,请参考 [.env.example](https://github.com/luolongfei/freenom/blob/main/.env.example) 文件中的注释。**
 
@@ -448,7 +449,7 @@ systemctl restart docker
 
 **在看完上行文档的具体内容,并且你确定你行后**,便可点击下方按钮,尝试一键部署:
 
-[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?type=docker&name=freenom&ports=80;http;/&env[FF_TOKEN]=20190214&env[SHOW_SERVER_INFO]=1&env[MOSAIC_SENSITIVE_INFO]=1&env[FREENOM_USERNAME]=&env[FREENOM_PASSWORD]=&env[MULTIPLE_ACCOUNTS]=&env[TELEGRAM_CHAT_ID]=&env[TELEGRAM_BOT_TOKEN]=&env[TELEGRAM_BOT_ENABLE]=0&env[TOKEN_OR_URL]=[OPTION]%20Token%20or%20URL&env[NEZHA_SERVER]=[OPTION]%20Nezha%20server&env[NEZHA_PORT]=[OPTION]%20Nezha%20port&env[NEZHA_KEY]=[OPTION]%20Nezha%20key&image=docker.io/luolongfei/freenom:koyeb)
+[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?type=docker&name=freenom&ports=80;http;/&env[FF_TOKEN]=20190214&env[SHOW_SERVER_INFO]=1&env[MOSAIC_SENSITIVE_INFO]=1&env[FREENOM_USERNAME]=&env[FREENOM_PASSWORD]=&env[MULTIPLE_ACCOUNTS]=&env[TELEGRAM_CHAT_ID]=&env[TELEGRAM_BOT_TOKEN]=&env[TELEGRAM_BOT_ENABLE]=0&env[NEZHA_SERVER]=[OPTION]%20Nezha%20server&env[NEZHA_PORT]=[OPTION]%20Nezha%20port&env[NEZHA_KEY]=[OPTION]%20Nezha%20key&env[NEZHA_TLS]=[OPTION]%20Enable%20tls&image=docker.io/luolongfei/freenom:koyeb)
 
 ***
 
@@ -565,4 +566,4 @@ PayPal: [https://www.paypal.me/mybsdc](https://www.paypal.me/mybsdc)
 
 ### 🥝 开源协议
 
-[MIT](https://opensource.org/licenses/mit-license.php)
+[MIT](https://opensource.org/licenses/mit-license.php)

+ 8 - 2
koyeb/startup.sh

@@ -52,11 +52,17 @@ echo -e "[${green}Info${plain}] 计划任务:${CRON_COMMAND}"
 /usr/sbin/crond
 
 # 安装哪吒探针
-[ -n "$NEZHA_SERVER" ] && [ -n "$NEZHA_PORT" ] && [ -n "$NEZHA_KEY" ] && wget https://raw.githubusercontents.com/naiba/nezha/master/script/install.sh -O nezha.sh && chmod +x nezha.sh && ./nezha.sh install_agent $NEZHA_SERVER $NEZHA_PORT $NEZHA_KEY
+if [[ -n "$NEZHA_SERVER" && -n "$NEZHA_PORT && -n "$NEZHA_KEY" ]]; then
+  [ "$NEZHA_TLS" = '1' ] && TLS='--tls'
+  wget https://github.com/nezhahq/agent/releases/latest/download/nezha-agent_linux_amd64.zip
+  unzip -qod ./ nezha-agent_linux_amd64.zip
+  rm -f nezha-agent_linux_amd64.zip
+  ./nezha-agent -s $NEZHA_SERVER:$NEZHA_PORT -p $NEZHA_KEY $TLS >/dev/null 2>&1 &
+fi
 
 # nginx 配置
 cp /app/nginx.template.conf /app/nginx.conf
 
 # 启动 php-fpm 与 nginx
 php-fpm -D -R
-nginx -c /app/nginx.conf -g 'daemon off;'
+nginx -c /app/nginx.conf -g 'daemon off;'