fix: add firewall rules to handle service reload

#35
kuoruan · Nov 4, 2019 · bb720f6 · bb720f6
1 parent af64890
commit bb720f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/root/etc/firewall.v2ray b/root/etc/firewall.v2ray
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+test -s "/etc/init.d/v2ray" && /etc/init.d/v2ray reload
diff --git a/root/etc/init.d/v2ray b/root/etc/init.d/v2ray
@@ -942,8 +942,3 @@ start_service() {
 stop_service() {
 	clear_v2ray_rules
 }
-
-service_triggers() {
-	procd_add_reload_trigger "v2ray" "firewall"
-	procd_add_raw_trigger "interface.*.up" 2000 /etc/init.d/v2ray reload
-}
diff --git a/root/etc/uci-defaults/40_luci-v2ray b/root/etc/uci-defaults/40_luci-v2ray
@@ -65,6 +65,14 @@ uci -q batch <<-EOF >/dev/null
 	add ucitrack v2ray
 	set ucitrack.@v2ray[-1].init=v2ray
 	commit ucitrack
+
+	delete firewall.v2ray
+	set firewall.v2ray=include
+	set firewall.v2ray.type=script
+	set firewall.v2ray.path=/etc/firewall.v2ray
+	set firewall.v2ray.family=any
+	set firewall.v2ray.reload=1
+	commit firewall
 EOF
 
 rm -rf /tmp/luci-indexcache /tmp/luci-modulecache