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

变更

Browse Source
This commit is contained in:
Reaper
2023-07-21 10:20:47 +08:00
parent 87f00a7202
commit 40d0ae90ff
10 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
.idea/workspace.xml generated
View File

@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="modify yungao git">
<list default="true" id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<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="HIGHLIGHT_CONFLICTS" value="true" />
@@ -17,6 +24,9 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://F:/我的电脑/Documents/WeChat Files/wxid_pj54dtlvkjzq11/FileStorage/File/2022-08/云高项目网络IP地址划分资料.xlsx" root0="SKIP_INSPECTION" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
@@ -25,16 +35,17 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "D:/phpstudy_pro/WWW/cdnflydadao",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;F:/我的电脑/Documents/WeChat Files/wxid_pj54dtlvkjzq11/FileStorage/File/2022-08&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}]]></component>
}</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
@@ -45,7 +56,9 @@
<updated>1670423856551</updated>
<workItem from="1670423857731" duration="4364000" />
<workItem from="1670430386964" duration="2490000" />
<workItem from="1670454611831" duration="16000" />
<workItem from="1670454611831" duration="625000" />
<workItem from="1670768307449" duration="103000" />
<workItem from="1689905971667" duration="68000" />
</task>
<task id="LOCAL-00001" summary="modify yungao git">
<created>1670424021829</created>
@@ -54,7 +67,14 @@
<option name="project" value="LOCAL" />
<updated>1670424021829</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="modify yungao git">
<created>1670454635337</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1670454635337</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">

10
README
View File

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

10
README_EN
View File

@@ -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://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es
curl -fsSL https://raw.gitmirror.com/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:
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
curl -fsSL https://raw.gitmirror.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
3. Charged
v5.1.15 version installation script:
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
curl -fsSL -m 5 https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/agent/agent.sh -o agent.sh || curl -m 5 https://raw.gitmirror.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
New v5.1.16 version installation script:
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
curl -fsSL -m 5 https://raw.gitmirror.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
4.
The happy method that has installed the official version:
Execute the following command to finish happy:
wget https://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py
wget https://raw.gitmirror.com/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
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
View File

@@ -154,7 +154,7 @@ tar_gz_name="$dir_name-$(get_sys_ver).tar.gz"
# 下载安装包
cd /opt
echo "开始下载$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"
download "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "$tar_gz_name"
echo "下载完成"
echo "开始解压..."

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

@@ -236,7 +236,7 @@ fi
cd /opt
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"
download "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/agent/$tar_gz_name" "$tar_gz_name"
rm -rf $dir_name
tar xf $tar_gz_name

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

@@ -219,7 +219,7 @@ else
fi
cd /opt/
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"
download "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/cdnfly/v5.1.13/master/$tar_gz_name" "https://raw.gitmirror.com/LoveesYe/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://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py
wget https://raw.gitmirror.com/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
source /opt/venv/bin/activate

2
master.sh
View File

@@ -220,7 +220,7 @@ else
fi
cd /opt/
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"
download "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name
rm -rf cdnfly

2
master/master.sh
View File

@@ -219,7 +219,7 @@ else
fi
cd /opt/
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"
download "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "$tar_gz_name"
tar xf $tar_gz_name
rm -rf cdnfly

2
web/README
View File

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

4
web/master.sh
View File

@@ -219,7 +219,7 @@ else
fi
cd /opt/
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"
download "https://raw.gitmirror.com/LoveesYe/cdnflydadao/raw/main/master/$tar_gz_name" "https://raw.gitmirror.com/LoveesYe/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://git.yungao-tech.com/shadow/cdnflydadao/raw/main/cdnfly/api.py -O /opt/venv/lib/python2.7/site-packages/requests/api.py
wget https://raw.gitmirror.com/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
source /opt/venv/bin/activate