sync (#506)

suyuan168 · Jun 25, 2024 · 2dd167d · 2dd167d
2 parents 9507537 + 39507bd
commit 2dd167d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
@@ -317,6 +317,7 @@ _check_master() {
 			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
 			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
 			/etc/init.d/openvpn restart omr >/dev/null 2>/dev/null
+			/etc/init.d/unbound restart >/dev/null 2>/dev/null
 			/etc/init.d/dnsmasq restart >/dev/null 2>/dev/null
 		}
 		break
@@ -503,6 +504,7 @@ _check_backup() {
 			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
 			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
 			/etc/init.d/openvpn restart omr >/dev/null 2>/dev/null
+			/etc/init.d/unbound restart >/dev/null 2>/dev/null
 			/etc/init.d/dnsmasq restart >/dev/null 2>/dev/null
 		}
 		[ "$server_ping" = true ] && break

diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
@@ -37,6 +37,16 @@ if [ -z "$(uci -q get unbound.ub_main.interface)" ]; then
 		set unbound.ub_main.interface='loopback'
 		commit unbound
 	EOF
+fi
+if [ -z "$(uci -q get unbound.ub_dhcp_link)" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set unbound.ub_main.dhcp_link='dnsmasq'
+		del unbound.ub_main.domain_type
+		del unbound.ub_main.add_local_fqdn
+		del unbound.ub_main.add_wan_fqdn
+		del unbound.ub_main.add_extra_dns
+		commit unbound
+	EOF
 
 fi
 if [ "$(uci -q show dhcp | grep 'use-application-dns.net')" = "" ]; then

diff --git a/shadowsocks-rust/Makefile b/shadowsocks-rust/Makefile
@@ -8,20 +8,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=shadowsocks-rust
-#PKG_VERSION:=1.20.0
-#PKG_HASH:=c818124252528886dd2a26c0f4730a34cdeb5764c3812cae0d98e9fc9c1d8ce9
-#PKG_VERSION:=1.19.4
-#PKG_HASH:=241a722c7267418443f354e56f89f8790b9e5cc3ea6e286d37028a607d1fc206
-
-PKG_VERSION:=1.19.3
-PKG_HASH:=d2ba10b56ae54378df40215705be6a5eee1ca96f30f4c59bc4fa001c1d6f676f
-
-#PKG_VERSION:=1.19.1
-#PKG_HASH:=ac1d396fddec990477588b89dd27dc55cb9e10320ae7a2d8bae20fb3bfeed320
-#PKG_VERSION:=1.19.0
-#PKG_HASH:=080d2042eede744d2182ebb47929b504cd42ef8e0eefacdc5ece402f99328ea8
-#PKG_VERSION:=1.18.4
-#PKG_HASH:=1df8961d4b16f756081a554bf84ded124d43062f92cf36f2ac3f590ee72d22f3
+PKG_VERSION:=1.20.1
+PKG_HASH:=95bef16ced3d937e085fdce0bc8de33e156c00bdc9c10100778d3e3ff4df95f0
+#PKG_VERSION:=1.19.3
+#PKG_HASH:=d2ba10b56ae54378df40215705be6a5eee1ca96f30f4c59bc4fa001c1d6f676f
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/xray-core/Makefile b/xray-core/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xray
-PKG_VERSION:=1.8.13
+PKG_VERSION:=1.8.16
 PKG_RELEASE:=1
 
 PKG_LICENSE:=MPLv2
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Yannick Chabanois <[email protected]>
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/XTLS/Xray-core.git
-PKG_SOURCE_VERSION:=3120ca41210312c5c8b1795eaf3dbf54531e437e
+PKG_SOURCE_VERSION:=9432a600e651d1304afec6fceed2a6245eaa4002
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1