tqcq/small-package
0
0
Fork 0
mirror of https://github.com/kenzok8/small-package.git synced 2026-02-05 06:17:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2022-12-18 20:16:10

Browse Source
This commit is contained in:
github-actions[bot]
2022-12-18 20:16:10 +08:00
parent a1be0e51d0
commit 4fd5968d39
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
haproxy/Makefile
View File

@@ -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)

8
haproxy/files/acme.hotplug
View File

@@ -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

8
luci-app-bypass/root/usr/share/bypass/update
View File

@@ -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