From 3eb1c16942ae389ff904871a65131fc59a3c3f15 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 5 Aug 2019 20:46:46 -0700 Subject: [PATCH] add https support for luci-app-unblockmusic --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../luasrc/model/cbi/unblockmusic.lua | 4 ---- .../root/etc/init.d/unblockmusic | 11 +++++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 90f45bcb3..58325cc0b 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=v2.1.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=Apache-2.0 diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index a92ac1712..1cbeb7392 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -24,8 +24,4 @@ speedtype:value("kuwo", translate("酷我音乐(高音质推荐)")) speedtype:value("migu", translate("咕咪音乐")) speedtype:value("joox", translate("JOOX音乐")) -account = s:option(Value, "port", translate("端口号")) -account.datatype = "string" - - return mp diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 295110b76..d16e56b9a 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -5,7 +5,6 @@ STOP=10 enable=$(uci get unblockmusic.@unblockmusic[0].enabled) TYPE=$(uci get unblockmusic.@unblockmusic[0].musicapptype) -PORT=$(uci get unblockmusic.@unblockmusic[0].port) ROUTE_IP=$(uci get network.lan.ipaddr) ipt_n="iptables -t nat" @@ -22,12 +21,12 @@ add_rule() $ipt_n -A cloud_music -d 192.168.0.0/16 -j RETURN $ipt_n -A cloud_music -d 224.0.0.0/4 -j RETURN $ipt_n -A cloud_music -d 240.0.0.0/4 -j RETURN - $ipt_n -A cloud_music -p tcp -j REDIRECT --to-ports $PORT - $ipt_n -I PREROUTING -p tcp -m set --match-set music dst -j cloud_music + $ipt_n -A cloud_music -p tcp -j REDIRECT --to-ports 5200 + $ipt_n -I PREROUTING -p tcp --dport 80 -m set --match-set music dst -j cloud_music } del_rule(){ - $ipt_n -D PREROUTING -p tcp -m set --match-set music dst -j cloud_music 2>/dev/null + $ipt_n -D PREROUTING -p tcp --dport 80 -m set --match-set music dst -j cloud_music 2>/dev/null $ipt_n -F cloud_music 2>/dev/null $ipt_n -X cloud_music 2>/dev/null @@ -58,9 +57,9 @@ start() [ $enable -eq "0" ] && exit 0 if [ $TYPE = "default" ]; then - node /usr/share/UnblockNeteaseMusic/app.js -p $PORT >/tmp/unblockmusic.log 2>&1 & + node /usr/share/UnblockNeteaseMusic/app.js -p 5200:5201 >/tmp/unblockmusic.log 2>&1 & else - node /usr/share/UnblockNeteaseMusic/app.js -p $PORT -o $TYPE >/tmp/unblockmusic.log 2>&1 & + node /usr/share/UnblockNeteaseMusic/app.js -p 5200:5201 -o $TYPE >/tmp/unblockmusic.log 2>&1 & fi set_firewall