Browse Source

modify yungao git

main
Reaper 3 years ago
parent
commit
87f00a7202
  1. 26
      .idea/workspace.xml
  2. 4
      README
  3. 4
      master/master.sh

26
.idea/workspace.xml

@ -1,7 +1,11 @@
<?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="modify yungao git" /> <list default="true" id="19fc4048-f9db-4d9d-ae64-642a4c8149c0" name="变更" comment="modify yungao git">
<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$/master/master.sh" beforeDir="false" afterPath="$PROJECT_DIR$/master/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" />
@ -21,15 +25,16 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;, "WebServerToolWindowFactoryState": "false",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "last_opened_file_path": "D:/phpstudy_pro/WWW/cdnflydadao",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="默认任务"> <task active="true" id="Default" summary="默认任务">
@ -39,7 +44,8 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1670423856551</updated> <updated>1670423856551</updated>
<workItem from="1670423857731" duration="4364000" /> <workItem from="1670423857731" duration="4364000" />
<workItem from="1670430386964" duration="665000" /> <workItem from="1670430386964" duration="2490000" />
<workItem from="1670454611831" duration="16000" />
</task> </task>
<task id="LOCAL-00001" summary="modify yungao git"> <task id="LOCAL-00001" summary="modify yungao git">
<created>1670424021829</created> <created>1670424021829</created>

4
README

@ -9,8 +9,8 @@
web目录为验证文件,请自行搭建 web目录为验证文件,请自行搭建
0.0.0.0改成(自己搭建的验证服务器Ip) 0.0.0.0改成(自己搭建的验证服务器Ip)
vi /etc/hosts vi /etc/hosts
0.0.0.0 auth.cdnfly.cn monitor.cdnfly.cn 114.132.217.36 auth.cdnfly.cn monitor.cdnfly.cn
0.0.0.0 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://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://git.yungao-tech.com/shadow/cdnflydadao/raw/main/master.sh -o master.sh && chmod +x master.sh && ./master.sh --es-dir /home/es

4
master/master.sh

@ -196,7 +196,7 @@ done
if [[ $VER == "" ]]; then if [[ $VER == "" ]]; then
# 获取最新版本 # 获取最新版本
echo "获取最新版..." echo "获取最新版..."
latest_version=`curl -s 'http://auth.fikkey.com/master/upgrades?latest=1' | grep -Po 'v\d+\.\d+.\d+' || true` latest_version=`curl -s 'http://fikkey.com/master/upgrades?latest=1' | grep -Po 'v\d+\.\d+.\d+' || true`
if [[ "$latest_version" == "" ]]; then if [[ "$latest_version" == "" ]]; then
echo "获取最新版失败,请先登录官网填入主控IP" echo "获取最新版失败,请先登录官网填入主控IP"
exit 1 exit 1
@ -231,7 +231,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
sed -i "s/https:\/\/update.cdnfly.cn\//http:\/\/auth.cdnfly.cn\/\/\/\//g" /opt/cdnfly/master/view/upgrade.so sed -i "s/https:\/\/update.cdnfly.cn\//http:\/\/cdnfly.cn\/\/\/\//g" /opt/cdnfly/master/view/upgrade.so
supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload supervisorctl -c /opt/cdnfly/master/conf/supervisord.conf reload
fi fi

Loading…
Cancel
Save