shadow
/
cdnflydadao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

变更

main
Reaper 2 years ago
parent
16dfd3d6d7
commit
9b1c4589e1
10 changed files with 39 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      .idea/workspace.xml
  2. 10
      README
  3. 10
      README_EN
  4. 2
      cdnfly/50113.sh
  5. 2
      cdnfly/v5.1.13/agent/agent.sh
  6. 4
      cdnfly/v5.1.13/master/master.sh
  7. 2
      master.sh
  8. 2
      master/master.sh
  9. 2
      web/README
  10. 4
      web/master.sh

23
.idea/workspace.xml
Unescape View File

@ -1,7 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="变更" /> <list default="true" id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="变更">
<change beforePath="$PROJECT_DIR$/README" beforeDir="false" afterPath="$PROJECT_DIR$/README" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README_EN" beforeDir="false" afterPath="$PROJECT_DIR$/README_EN" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cdnfly/50113.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cdnfly/50113.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cdnfly/v5.1.13/agent/agent.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cdnfly/v5.1.13/agent/agent.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cdnfly/v5.1.13/master/master.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cdnfly/v5.1.13/master/master.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/master.sh" beforeDir="false" afterPath="$PROJECT_DIR$/master.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/master/master.sh" beforeDir="false" afterPath="$PROJECT_DIR$/master/master.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web/README" beforeDir="false" afterPath="$PROJECT_DIR$/web/README" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web/master.sh" beforeDir="false" afterPath="$PROJECT_DIR$/web/master.sh" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -47,7 +57,7 @@
<workItem from="1670430386964" duration="2490000" /> <workItem from="1670430386964" duration="2490000" />
<workItem from="1670454611831" duration="625000" /> <workItem from="1670454611831" duration="625000" />
<workItem from="1670768307449" duration="103000" /> <workItem from="1670768307449" duration="103000" />
<workItem from="1689905971667" duration="142000" /> <workItem from="1689905971667" duration="628000" />
</task> </task>
<task id="LOCAL-00001" summary="modify yungao git"> <task id="LOCAL-00001" summary="modify yungao git">
<created>1670424021829</created> <created>1670424021829</created>
@ -70,7 +80,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1689906048020</updated> <updated>1689906048020</updated>
</task> </task>
<option name="localTasksCounter" value="4" /> <task id="LOCAL-00004" summary="变更">
<created>1689906331181</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1689906331181</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">

10
README
Unescape View File

@ -13,23 +13,23 @@ vi /etc/hosts
114.132.217.36 auth.cdnfly.cn monitor.cdnfly.cn 114.132.217.36 auth.cdnfly.cn monitor.cdnfly.cn
2.主控 2.主控
v5.1.11版本安装脚本: v5.1.11版本安装脚本:
curl -fsSL https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es curl -fsSL http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es
新v5.1.13版本安装脚本: 新v5.1.13版本安装脚本:
curl -fsSL https://raw.fastgit.org/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 http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es
3.被控 3.被控
v5.1.15版本安装脚本: v5.1.15版本安装脚本:
curl -fsSL -m 5 https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://raw.fastgit.org/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 http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 http://43.133.136.107/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
新v5.1.16版本安装脚本: 新v5.1.16版本安装脚本:
curl -fsSL -m 5 https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh || curl -m 5 https://raw.fastgit.org/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 http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/agent.sh -o agent.sh || curl -m 5 http://43.133.136.107/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. 4.
已安装过官方版的开心方法： 已安装过官方版的开心方法：
执行以下命令完成开心： 执行以下命令完成开心：
wget https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py wget http://43.133.136.107/LoveesYe/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 supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload
如果旧版本要升级，可以先更新自建云端的文件，然后执行“已安装过官方版的开心方法”这一部分的命令，最后在主控后台升级。 如果旧版本要升级，可以先更新自建云端的文件，然后执行“已安装过官方版的开心方法”这一部分的命令，最后在主控后台升级。

10
README_EN
Unescape View File

@ -14,23 +14,23 @@ vi /etc/hosts
0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn 0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn
2. Master control 2. Master control
v5.1.11 version installation script: v5.1.11 version installation script:
curl -fsSL https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es curl -fsSL http://43.133.136.107/LoveesYe/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: New v5.1.13 version installation script:
curl -fsSL https://raw.fastgit.org/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 http://43.133.136.107/LoveesYe/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 3. Charged
v5.1.15 version installation script: v5.1.15 version installation script:
curl -fsSL -m 5 https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://raw.fastgit.org/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 http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 http://43.133.136.107/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
New v5.1.16 version installation script: New v5.1.16 version installation script:
curl -fsSL -m 5 https://raw.fastgit.org/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 http://43.133.136.107/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
4. 4.
The happy method that has installed the official version: The happy method that has installed the official version:
Execute the following command to finish happy: Execute the following command to finish happy:
wget https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py wget http://43.133.136.107/LoveesYe/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 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. 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.

2
cdnfly/50113.sh
Unescape View File

@ -154,7 +154,7 @@ tar_gz_name="$dir_name-$(get_sys_ver).tar.gz"
# 下载安装包 # 下载安装包
cd /opt cd /opt
echo "开始下载$tar_gz_name..." echo "开始下载$tar_gz_name..."
download "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name" download "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name"
echo "下载完成" echo "下载完成"
echo "开始解压..." echo "开始解压..."

2
cdnfly/v5.1.13/agent/agent.sh
Unescape View File

@ -236,7 +236,7 @@ fi
cd /opt cd /opt
download "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name" download "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name"
rm -rf $dir_name rm -rf $dir_name
tar xf $tar_gz_name tar xf $tar_gz_name

4
cdnfly/v5.1.13/master/master.sh
Unescape View File

@ -219,7 +219,7 @@ else
fi fi
cd /opt/ cd /opt/
download "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name" download "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name tar xf $tar_gz_name
rm -rf cdnfly rm -rf cdnfly
@ -235,7 +235,7 @@ chmod +x install.sh
./install.sh $@ ./install.sh $@
if [ -f /opt/cdnfly/master/view/upgrade.so ]; then if [ -f /opt/cdnfly/master/view/upgrade.so ]; then
wget https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py wget http://43.133.136.107/LoveesYe/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 supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload
source /opt/venv/bin/activate source /opt/venv/bin/activate

2
master.sh
Unescape View File

@ -220,7 +220,7 @@ else
fi fi
cd /opt/ cd /opt/
download "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" download "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name tar xf $tar_gz_name
rm -rf cdnfly rm -rf cdnfly

2
master/master.sh
Unescape View File

@ -219,7 +219,7 @@ else
fi fi
cd /opt/ cd /opt/
download "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" download "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name tar xf $tar_gz_name
rm -rf cdnfly rm -rf cdnfly

2
web/README
Unescape View File

@ -6,5 +6,5 @@ cdnfly通过改hosts破解授权方法：
然后在需要搭建主控的节点上，修改hosts，将 auth.cdnfly.cn、monitor.cdnfly.cn 这2个域名指向刚才的服务器IP 然后在需要搭建主控的节点上，修改hosts，将 auth.cdnfly.cn、monitor.cdnfly.cn 这2个域名指向刚才的服务器IP
执行以下命令完成开心： 执行以下命令完成开心：
wget https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py wget http://43.133.136.107/LoveesYe/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 supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload

4
web/master.sh
Unescape View File

@ -219,7 +219,7 @@ else
fi fi
cd /opt/ cd /opt/
download "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name" download "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "http://43.133.136.107/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name tar xf $tar_gz_name
rm -rf cdnfly rm -rf cdnfly
@ -235,7 +235,7 @@ chmod +x install.sh
./install.sh $@ ./install.sh $@
if [ -f /opt/cdnfly/master/view/upgrade.so ]; then if [ -f /opt/cdnfly/master/view/upgrade.so ]; then
wget https://raw.fastgit.org/LoveesYe/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py wget http://43.133.136.107/LoveesYe/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 supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload
source /opt/venv/bin/activate source /opt/venv/bin/activate

Write Preview
Loading…
Cancel
Save