From c9c96e73cc5e209feedc11f9330c4d6c788c90ba Mon Sep 17 00:00:00 2001 From: Reaper Date: Wed, 7 Dec 2022 22:40:21 +0800 Subject: [PATCH] modify yungao git --- README | 10 +++++----- README_EN | 10 +++++----- agent/agent.sh | 4 ++-- cdnfly/50113.sh | 2 +- cdnfly/v5.1.13/agent/agent.sh | 2 +- cdnfly/v5.1.13/master/master.sh | 4 ++-- master.sh | 2 +- master/master.sh | 2 +- web/README | 2 +- web/master.sh | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README b/README index 3d010bf..51d73c7 100644 --- a/README +++ b/README @@ -13,23 +13,23 @@ vi /etc/hosts 0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn 2.主控 v5.1.11版本安装脚本: -curl -fsSL https://github.com/LoveesYe/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es +curl -fsSL https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es 新v5.1.13版本安装脚本: -curl -fsSL https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es +curl -fsSL https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/master/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es 3.被控 v5.1.15版本安装脚本: -curl -fsSL -m 5 https://github.com/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://github.com/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master-ip ip --es-ip ip --es-pwd passwd +curl -fsSL -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master-ip ip --es-ip ip --es-pwd passwd 新v5.1.16版本安装脚本: -curl -fsSL -m 5 https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh || curl -m 5 https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master-ip ip --es-ip ip --es-pwd passwd +curl -fsSL -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh || curl -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master-ip ip --es-ip ip --es-pwd passwd 4. 已安装过官方版的开心方法： 执行以下命令完成开心： -wget https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py +wget https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload 如果旧版本要升级，可以先更新自建云端的文件，然后执行“已安装过官方版的开心方法”这一部分的命令，最后在主控后台升级。 diff --git a/README_EN b/README_EN index 88b46b1..d10afcc 100644 --- a/README_EN +++ b/README_EN @@ -14,23 +14,23 @@ vi /etc/hosts 0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn 2. Master control v5.1.11 version installation script: -curl -fsSL https://github.com/LoveesYe/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es +curl -fsSL https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es New v5.1.13 version installation script: -curl -fsSL https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/master.sh -o master.sh && chmod +x master.sh && ./master.sh -- es-dir /home/es +curl -fsSL https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/master/master.sh -o master.sh && chmod +x master.sh && ./master.sh -- es-dir /home/es 3. Charged v5.1.15 version installation script: -curl -fsSL -m 5 https://github.com/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://github.com/LoveesYe/cdnflydadao/ raw/main/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master-ip ip --es-ip ip --es -pwd passwd +curl -fsSL -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/ raw/main/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master-ip ip --es-ip ip --es -pwd passwd New v5.1.16 version installation script: -curl -fsSL -m 5 https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh || curl -m 5 https://github. com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master -ip ip --es-ip ip --es-pwd passwd +curl -fsSL -m 5 https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh || curl -m 5 https://github. com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh && chmod +x agent.sh && ./agent.sh --master-ver v5.1.11 --master -ip ip --es-ip ip --es-pwd passwd 4. The happy method that has installed the official version: Execute the following command to finish happy: -wget https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py +wget https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload If you want to upgrade the old version, you can first update the files in the self-built cloud, and then execute the command in the section "Happy Ways that have already installed the official version", and finally upgrade in the main control background. diff --git a/agent/agent.sh b/agent/agent.sh index 1ab0acb..e4b0a86 100644 --- a/agent/agent.sh +++ b/agent/agent.sh @@ -219,7 +219,7 @@ else second_part=$(printf "%02d\n" `echo $MASTER_VER | awk -F'.' '{print $2}'`) third_part=$(printf "%02d\n" `echo $MASTER_VER | awk -F'.' '{print $3}'`) version_num="$first_part$second_part$third_part" - agent_ver=`(curl -s -m 5 "http://auth.fikkey.com/master/upgrades?version_num=$version_num" || curl -s -m 5 "https://github.com/LoveesYe/cdnflydadao/raw/main/web/upgrades?version_num=$version_num") | grep -Po '"agent_ver":"\d+"' | grep -Po "\d+" || true` + agent_ver=`(curl -s -m 5 "http://auth.fikkey.com/master/upgrades?version_num=$version_num" || curl -s -m 5 "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/web/upgrades?version_num=$version_num") | grep -Po '"agent_ver":"\d+"' | grep -Po "\d+" || true` if [[ "$agent_ver" == "" ]]; then echo "无法获取agent版本" exit 1 @@ -237,7 +237,7 @@ fi cd /opt -download "https://github.com/LoveesYe/cdnflydadao/raw/main/agent/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/agent/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/agent/$tar_gz_name" "$tar_gz_name" rm -rf $dir_name tar xf $tar_gz_name diff --git a/cdnfly/50113.sh b/cdnfly/50113.sh index 3598606..50e6d75 100644 --- a/cdnfly/50113.sh +++ b/cdnfly/50113.sh @@ -154,7 +154,7 @@ tar_gz_name="$dir_name-$(get_sys_ver).tar.gz" # 下载安装包 cd /opt echo "开始下载$tar_gz_name..." -download "https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name" echo "下载完成" echo "开始解压..." diff --git a/cdnfly/v5.1.13/agent/agent.sh b/cdnfly/v5.1.13/agent/agent.sh index a6eddbb..7973428 100644 --- a/cdnfly/v5.1.13/agent/agent.sh +++ b/cdnfly/v5.1.13/agent/agent.sh @@ -236,7 +236,7 @@ fi cd /opt -download "https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name" rm -rf $dir_name tar xf $tar_gz_name diff --git a/cdnfly/v5.1.13/master/master.sh b/cdnfly/v5.1.13/master/master.sh index 09b75f1..29c0a08 100644 --- a/cdnfly/v5.1.13/master/master.sh +++ b/cdnfly/v5.1.13/master/master.sh @@ -219,7 +219,7 @@ else fi cd /opt/ -download "https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name" tar xf $tar_gz_name rm -rf cdnfly @@ -235,7 +235,7 @@ chmod +x install.sh ./install.sh $@ if [ -f /opt/cdnfly/master/view/upgrade.so ]; then - wget https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py + wget https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload source /opt/venv/bin/activate diff --git a/master.sh b/master.sh index 86d8e2a..7a847b5 100644 --- a/master.sh +++ b/master.sh @@ -220,7 +220,7 @@ else fi cd /opt/ -download "https://github.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" tar xf $tar_gz_name rm -rf cdnfly diff --git a/master/master.sh b/master/master.sh index 3bd6416..41d65fb 100644 --- a/master/master.sh +++ b/master/master.sh @@ -219,7 +219,7 @@ else fi cd /opt/ -download "https://github.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" tar xf $tar_gz_name rm -rf cdnfly diff --git a/web/README b/web/README index 7bef6d8..d0a2a1c 100644 --- a/web/README +++ b/web/README @@ -6,5 +6,5 @@ cdnfly通过改hosts破解授权方法： 然后在需要搭建主控的节点上，修改hosts，将 auth.cdnfly.cn、monitor.cdnfly.cn 这2个域名指向刚才的服务器IP 执行以下命令完成开心： -wget https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py +wget https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload diff --git a/web/master.sh b/web/master.sh index 72c6985..61e4d74 100644 --- a/web/master.sh +++ b/web/master.sh @@ -219,7 +219,7 @@ else fi cd /opt/ -download "https://github.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://github.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" +download "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" tar xf $tar_gz_name rm -rf cdnfly @@ -235,7 +235,7 @@ chmod +x install.sh ./install.sh $@ if [ -f /opt/cdnfly/master/view/upgrade.so ]; then - wget https://github.com/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py + wget https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload source /opt/venv/bin/activate