luci-app-openclash & luci-app-koolproxy: sync source

This commit is contained in:
CN_SZTL 2019-07-29 01:47:46 +08:00
parent 1d5143812e
commit dce2dd8b33
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 7 additions and 12 deletions

View File

@ -344,9 +344,6 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then
echo "第六步: 设置 OpenClash 防火墙规则..." >$START_LOG
ln -s /usr/share/openclash/yacd /www/openclash 2>/dev/null
uci set firewall.@defaults[0].flow_offloading=1
uci commit firewall
/etc/init.d/firewall restart >/dev/null 2>&1
iptables -t nat -N openclash
iptables -t nat -N openclash_dns
@ -438,9 +435,6 @@ stop()
ip6tables -t nat -X openclash >/dev/null 2>&1
ip6tables -t nat -X openclash_dns >/dev/null 2>&1
uci set firewall.@defaults[0].flow_offloading=1
uci commit firewall
/etc/init.d/firewall restart >/dev/null 2>&1
echo "第二步: 关闭 OpenClash 守护程序..." >$START_LOG
kill -9 "$(ps |grep openclash_watchdog.sh |grep -v grep |awk '{print $1}')" >/dev/null 2>&1

View File

@ -33,7 +33,8 @@ o:value("linux-mips-hardfloat")
o:value("linux-mips-softfloat")
o:value("linux-mips64")
o:value("linux-mips64le")
o:value("linux-mipsle")
o:value("linux-mipsle-softfloat")
o:value("linux-mipsle-hardfloat")
o:value("0", translate("Not Set"))
o.default=0

View File

@ -2,7 +2,7 @@
<fieldset class="cbi-section">
<table>
<tr><td width="100%" colspan="4" align="center" id="update_tip"><b> 注意:如下载失败可手动下载并上传,内核路径为:/etc/openclash </b></td></tr>
<tr><td width="100%" colspan="4" align="center" id="update_tip"><b> 注意:如更新失败可手动下载并上传,内核路径为:/etc/openclash </b></td></tr>
<tr><td width="25%"> 已选择编译版本 </td><td width="25%" align="left" id="CORE_VERSION"><%:Collecting data...%></td><td width="25%"> 上次检查更新时间 </td><td width="25%" align="left" id="CHECKTIME"><%:Collecting data...%></td></tr>
<tr><td width="25%"> 处理器架构PROC </td><td width="25%" align="left" id="CPU_MODEL"><%:Collecting data...%></td><td width="25%"> 处理器架构OPKG </td><td width="25%" align="left" id="CPU_MODEL2"><%:Collecting data...%></td></tr>
<tr><td width="25%"> 当前内核版本 </td><td width="25%" align="left" id="CORE_CV"><%:Collecting data...%></td><td width="25%"> 当前客户端版本 </td><td width="25%" align="left" id="OP_CV"><%:Collecting data...%></td></tr>
@ -194,7 +194,7 @@
var rdmdl=Math.floor(Math.random()*2)+1;
if(rdmdl==1)
{
update_tip.innerHTML = '<b><font><%: 注意:如下载失败可手动下载并上传,内核路径为:/etc/openclash %></font></b>';
update_tip.innerHTML = '<b><font><%: 注意:如更新失败可手动下载并上传,内核路径为:/etc/openclash %></font></b>';
}
if(rdmdl==2)
{

View File

View File

@ -1,5 +1,5 @@
0|yhosts.txt|https://github.com/user1121114685/koolproxyR/raw/master/koolproxyR/koolproxyR/data/rules/yhosts.txt|yhosts规则
0|kp.dat|https://kprule.com/kp.dat|视频规则
0|kp.dat|https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat|视频规则
0|user.txt||自定义规则
0|easylistchina.txt|https://github.com/user1121114685/koolproxyR/raw/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt|ABP规则
0|chengfeng.txt|https://kprule.com/chengfeng.txt|乘风规则

View File

@ -109,7 +109,7 @@ update_rss_rules() {
update_rules() {
echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat' -q -O $KP_DIR/data/rules/kp.dat
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/fanboy-annoyance.txt' -q -O $KP_DIR/data/rules/fanboy.txt
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt' -q -O $KP_DIR/data/rules/easylistchina.txt

View File

@ -1,4 +1,4 @@
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/kp.dat' -O files/usr/share/koolproxy/data/rules/kp.dat
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat' -O files/usr/share/koolproxy/data/rules/kp.dat
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/yhosts.txt' -O files/usr/share/koolproxy/data/rules/yhosts.txt
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/fanboy-annoyance.txt' -O files/usr/share/koolproxy/data/rules/fanboy.txt
wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt' -O files/usr/share/koolproxy/data/rules/easylistchina.txt