From 4fd5968d3938f3f5ff8a7cc4486069b5b31dd62c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Dec 2022 20:16:10 +0800
Subject: [PATCH] update 2022-12-18 20:16:10

---
 haproxy/Makefile                             | 4 +---
 haproxy/files/acme.hotplug                   | 8 --------
 luci-app-bypass/root/usr/share/bypass/update | 8 ++++----
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 haproxy/files/acme.hotplug

diff --git a/haproxy/Makefile b/haproxy/Makefile
index 179658361..1c0d8fde1 100644
--- a/haproxy/Makefile
+++ b/haproxy/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
 PKG_VERSION:=2.6.6
-PKG_RELEASE:=103
+PKG_RELEASE:=104
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src
@@ -122,8 +122,6 @@ define Package/haproxy/install
 	$(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/acme
-	$(INSTALL_DATA) ./files/acme.hotplug $(1)/etc/hotplug.d/acme/00-haproxy
 endef
 
 Package/haproxy-nossl/install = $(Package/haproxy/install)
diff --git a/haproxy/files/acme.hotplug b/haproxy/files/acme.hotplug
deleted file mode 100644
index 9896bbdee..000000000
--- a/haproxy/files/acme.hotplug
+++ /dev/null
@@ -1,8 +0,0 @@
-case $ACTION in
-issued|renewed)
-	cat \
-		"/etc/ssl/acme/$main_domain.fullchain.crt" \
-		"/etc/ssl/acme/$main_domain.key" \
-		>"/etc/ssl/acme/$main_domain.combined.crt"
-	;;
-esac
diff --git a/luci-app-bypass/root/usr/share/bypass/update b/luci-app-bypass/root/usr/share/bypass/update
index 63bd5e178..8d6746c96 100755
--- a/luci-app-bypass/root/usr/share/bypass/update
+++ b/luci-app-bypass/root/usr/share/bypass/update
@@ -17,11 +17,11 @@ C=$(uci -q get bypass.@global[0].run_mode)
 mkdir -p $T_FILE 2>/dev/null
 if [ "$C" = router ];then
 	if [ ! -f $T_FILE/china.txt ];then
-		while ! (curl -kLfsm 3 -o /tmp/china.txt https://supes.top/bypass/all_cn.txt || curl -kLfsm 5 -o /tmp/china.txt https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt);do
+		while ! (curl -kLfsm 3 -o /tmp/china.txt http://static.supes.top/bypass/all_cn.txt || curl -kLfsm 5 -o /tmp/china.txt https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt);do
 			sleep 1
 		done
 	else
-		curl -kLfsm 3 -o /tmp/china.txt https://supes.top/bypass/all_cn.txt || curl -kLfsm 5 -o /tmp/china.txt https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt
+		curl -kLfsm 3 -o /tmp/china.txt http://static.supes.top/bypass/all_cn.txt || curl -kLfsm 5 -o /tmp/china.txt https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt
 	fi
 	[[ -f /tmp/china.txt && $? == 0 ]] && {
 	if ! cmp -s /tmp/china.txt $T_FILE/china.txt;then
@@ -32,11 +32,11 @@ if [ "$C" = router ];then
 	}
 
 	if [ ! -f $T_FILE/china_v6.txt ];then
-		while ! (curl -kLfsm 3 -o /tmp/china_v6.txt https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 3 -o /tmp/china_v6.txt https://supes.top/bypass/all_cn_ipv6.txt);do
+		while ! (curl -kLfsm 3 -o /tmp/china_v6.txt https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 3 -o /tmp/china_v6.txt http://static.supes.top/bypass/all_cn_ipv6.txt);do
 			sleep 1
 		done
 	elif [ $A = N ];then
-		curl -kLfsm 3 -o /tmp/china_v6.txt https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 3 -o /tmp/china_v6.txt https://supes.top/bypass/all_cn_ipv6.txt
+		curl -kLfsm 3 -o /tmp/china_v6.txt https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 3 -o /tmp/china_v6.txt http://static.supes.top/bypass/all_cn_ipv6.txt
 	fi
 	[[ -f /tmp/china_v6.txt && $? == 0 ]] && {
 	if ! cmp -s /tmp/china_v6.txt $T_FILE/china_v6.txt;then