mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2025-12-12 06:26:55 +03:00
Add configs from ipset directory
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (<28>) 2024 remittor
|
# Copyright (<28>) 2024 remittor
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
@@ -52,7 +52,12 @@ endef
|
|||||||
define Package/$(PKG_NAME)/conffiles
|
define Package/$(PKG_NAME)/conffiles
|
||||||
/etc/config/zapret
|
/etc/config/zapret
|
||||||
/opt/zapret/config
|
/opt/zapret/config
|
||||||
/opt/zapret/youtube.txt
|
/opt/zapret/ipset/zapret-hosts-user.txt
|
||||||
|
/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||||
|
/opt/zapret/ipset/zapret-hosts-user-ipban.txt
|
||||||
|
/opt/zapret/ipset/zapret-ip-user.txt
|
||||||
|
/opt/zapret/ipset/zapret-ip-user-exclude.txt
|
||||||
|
/opt/zapret/ipset/zapret-ip-user-ipban.txt
|
||||||
endef
|
endef
|
||||||
|
|
||||||
#define Build/Configure
|
#define Build/Configure
|
||||||
@@ -73,8 +78,8 @@ define Package/$(PKG_NAME)/install
|
|||||||
$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret/files/
|
$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret/files/
|
||||||
$(INSTALL_DIR) $(1)/opt/zapret/ipset
|
$(INSTALL_DIR) $(1)/opt/zapret/ipset
|
||||||
$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret/ipset/
|
$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret/ipset/
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/blockcheck.sh $(1)/opt/zapret/blockcheck.sh
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/blockcheck.sh $(1)/opt/zapret/blockcheck.sh
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret/config.default
|
$(INSTALL_CONF) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret/config.default
|
||||||
$(INSTALL_DIR) $(1)/opt/zapret/tmp
|
$(INSTALL_DIR) $(1)/opt/zapret/tmp
|
||||||
$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
|
$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
|
||||||
$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret/init.d/openwrt/
|
$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret/init.d/openwrt/
|
||||||
@@ -85,7 +90,15 @@ define Package/$(PKG_NAME)/install
|
|||||||
$(INSTALL_DIR) $(1)/etc/config
|
$(INSTALL_DIR) $(1)/etc/config
|
||||||
$(INSTALL_CONF) ./zapret.config $(1)/etc/config/zapret
|
$(INSTALL_CONF) ./zapret.config $(1)/etc/config/zapret
|
||||||
$(INSTALL_CONF) ./config $(1)/opt/zapret/config
|
$(INSTALL_CONF) ./config $(1)/opt/zapret/config
|
||||||
$(INSTALL_CONF) ./youtube.txt $(1)/opt/zapret/youtube.txt
|
#$(INSTALL_CONF) ./ipset/zapret-hosts-auto.txt $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-hosts-user.txt $(1)/opt/zapret/ipset/zapret-hosts-user.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-hosts-user-ipban.txt $(1)/opt/zapret/ipset/zapret-hosts-user-ipban.txt
|
||||||
|
#$(INSTALL_CONF) ./ipset/zapret-ip.txt $(1)/opt/zapret/ipset/zapret-ip.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-ip-exclude.txt $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-ip-user.txt $(1)/opt/zapret/ipset/zapret-ip-user.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-ip-user-exclude.txt $(1)/opt/zapret/ipset/zapret-ip-user-exclude.txt
|
||||||
|
$(INSTALL_CONF) ./ipset/zapret-ip-user-ipban.txt $(1)/opt/zapret/ipset/zapret-ip-user-ipban.txt
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/postinst
|
define Package/$(PKG_NAME)/postinst
|
||||||
|
|||||||
@@ -61,14 +61,14 @@ MODE_HTTPS=1
|
|||||||
MODE_QUIC=1
|
MODE_QUIC=1
|
||||||
|
|
||||||
# none,ipset,hostlist,autohostlist
|
# none,ipset,hostlist,autohostlist
|
||||||
MODE_FILTER=autohostlist
|
MODE_FILTER=hostlist
|
||||||
|
|
||||||
# CHOOSE NFQWS DAEMON OPTIONS for DPI desync mode. run "nfq/nfqws --help" for option list
|
# CHOOSE NFQWS DAEMON OPTIONS for DPI desync mode. run "nfq/nfqws --help" for option list
|
||||||
DESYNC_MARK=0x40000000
|
DESYNC_MARK=0x40000000
|
||||||
DESYNC_MARK_POSTNAT=0x20000000
|
DESYNC_MARK_POSTNAT=0x20000000
|
||||||
|
|
||||||
|
|
||||||
NFQWS_OPT_DESYNC="--hostlist=/opt/zapret/youtube.txt --dpi-desync=fake,disorder2 --dpi-desync-split-pos=1 --dpi-desync-ttl=0 --dpi-desync-fooling=md5sig,badsum --dpi-desync-repeats=6 --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin"
|
NFQWS_OPT_DESYNC="--dpi-desync=fake,disorder2 --dpi-desync-split-pos=1 --dpi-desync-ttl=0 --dpi-desync-fooling=md5sig,badsum --dpi-desync-repeats=6 --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin"
|
||||||
|
|
||||||
NFQWS_OPT_DESYNC_SUFFIX=""
|
NFQWS_OPT_DESYNC_SUFFIX=""
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ NFQWS_OPT_DESYNC_HTTPS6=""
|
|||||||
|
|
||||||
NFQWS_OPT_DESYNC_HTTPS6_SUFFIX=""
|
NFQWS_OPT_DESYNC_HTTPS6_SUFFIX=""
|
||||||
|
|
||||||
NFQWS_OPT_DESYNC_QUIC="--hostlist=/opt/zapret/youtube.txt --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-ttl=0 --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_google_com.bin"
|
NFQWS_OPT_DESYNC_QUIC="--dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-ttl=0 --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_google_com.bin"
|
||||||
|
|
||||||
NFQWS_OPT_DESYNC_QUIC_SUFFIX=""
|
NFQWS_OPT_DESYNC_QUIC_SUFFIX=""
|
||||||
|
|
||||||
|
|||||||
6
zapret/ipset/zapret-hosts-user-exclude.txt
Normal file
6
zapret/ipset/zapret-hosts-user-exclude.txt
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
10.0.0.0/8
|
||||||
|
172.16.0.0/12
|
||||||
|
192.168.0.0/16
|
||||||
|
169.254.0.0/16
|
||||||
|
fc00::/7
|
||||||
|
fe80::/10
|
||||||
0
zapret/ipset/zapret-hosts-user-ipban.txt
Normal file
0
zapret/ipset/zapret-hosts-user-ipban.txt
Normal file
24
zapret/ipset/zapret-hosts-user.txt
Normal file
24
zapret/ipset/zapret-hosts-user.txt
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
googlevideo.com
|
||||||
|
youtube.com
|
||||||
|
m.youtube.com
|
||||||
|
ytimg.com
|
||||||
|
s.ytimg.com
|
||||||
|
ytimg.l.google.com
|
||||||
|
youtube.l.google.com
|
||||||
|
i.google.com
|
||||||
|
youtu.be
|
||||||
|
yt.be
|
||||||
|
accounts.youtube.com
|
||||||
|
consent.youtube.com
|
||||||
|
realtimesupport.youtube.com
|
||||||
|
studio.youtube.com
|
||||||
|
i9.ytimg.com
|
||||||
|
i.ytimg.com
|
||||||
|
yt3.ggpht.com
|
||||||
|
youtubekids.com
|
||||||
|
googleusercontent.com
|
||||||
|
googleapis.com
|
||||||
|
youtubei.googleapis.com
|
||||||
|
notifications-pa.googleapis.com
|
||||||
|
gstatic.com
|
||||||
|
suggestqueries.google.com
|
||||||
4
zapret/ipset/zapret-ip-exclude.txt
Normal file
4
zapret/ipset/zapret-ip-exclude.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
10.0.0.0/8
|
||||||
|
169.254.0.0/16
|
||||||
|
172.16.0.0/12
|
||||||
|
192.168.0.0/16
|
||||||
0
zapret/ipset/zapret-ip-user-exclude.txt
Normal file
0
zapret/ipset/zapret-ip-user-exclude.txt
Normal file
0
zapret/ipset/zapret-ip-user-ipban.txt
Normal file
0
zapret/ipset/zapret-ip-user-ipban.txt
Normal file
0
zapret/ipset/zapret-ip-user.txt
Normal file
0
zapret/ipset/zapret-ip-user.txt
Normal file
@@ -1 +0,0 @@
|
|||||||
googlevideo.com
|
|
||||||
@@ -1,2 +1,27 @@
|
|||||||
config zapret
|
config main 'config'
|
||||||
option startup '0'
|
option autostart '0'
|
||||||
|
option FWTYPE 'nftables'
|
||||||
|
option MODE 'nfqws'
|
||||||
|
option FLOWOFFLOAD 'none'
|
||||||
|
option INIT_APPLY_FW '1'
|
||||||
|
option DISABLE_IPV4 '0'
|
||||||
|
option DISABLE_IPV6 '1'
|
||||||
|
option MODE_FILTER 'hostlist'
|
||||||
|
option NFQWS_OPT_DESYNC '--dpi-desync=fake,disorder2 --dpi-desync-split-pos=1 --dpi-desync-ttl=0 --dpi-desync-fooling=md5sig,badsum --dpi-desync-repeats=6 --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin'
|
||||||
|
option NFQWS_OPT_DESYNC_SUFFIX ''
|
||||||
|
option MODE_HTTP '1'
|
||||||
|
option MODE_HTTP_KEEPALIVE '0'
|
||||||
|
option NFQWS_OPT_DESYNC_HTTP ''
|
||||||
|
option NFQWS_OPT_DESYNC_HTTP_SUFFIX ''
|
||||||
|
option NFQWS_OPT_DESYNC_HTTP6 ''
|
||||||
|
option NFQWS_OPT_DESYNC_HTTP6_SUFFIX ''
|
||||||
|
option MODE_HTTPS '1'
|
||||||
|
option NFQWS_OPT_DESYNC_HTTPS ''
|
||||||
|
option NFQWS_OPT_DESYNC_HTTPS_SUFFIX ''
|
||||||
|
option NFQWS_OPT_DESYNC_HTTPS6 ''
|
||||||
|
option NFQWS_OPT_DESYNC_HTTPS6_SUFFIX ''
|
||||||
|
option MODE_QUIC '1'
|
||||||
|
option NFQWS_OPT_DESYNC_QUIC '--dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-ttl=0 --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_google_com.bin'
|
||||||
|
option NFQWS_OPT_DESYNC_QUIC_SUFFIX ''
|
||||||
|
option NFQWS_OPT_DESYNC_QUIC6 ''
|
||||||
|
option NFQWS_OPT_DESYNC_QUIC6_SUFFIX ''
|
||||||
|
|||||||
Reference in New Issue
Block a user