i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-14 22:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ruantiblock: Default configuration changes. Fixed ruab_parser.py.

Browse Source
This commit is contained in:
gSpot
2022-04-11 18:55:15 +03:00
parent 97dff7b5a8
commit 2d1a7f14a8
8 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoinstall/autoinstall.sh
+2 -2
View File
@@ -9,8 +9,8 @@ LUA_MODULE=1
LUCI_APP=1 LUCI_APP=1
OWRT_VERSION="current" OWRT_VERSION="current"
RUAB_VERSION="0.9.1-2" RUAB_VERSION="0.9.1-3"
RUAB_MOD_LUA_VERSION="0.9.1-2" RUAB_MOD_LUA_VERSION="0.9.1-3"
RUAB_LUCI_APP_VERSION="0.9.1-2" RUAB_LUCI_APP_VERSION="0.9.1-2"
BASE_URL="https://github.com/gSpotx2f/packages-openwrt/raw/master" BASE_URL="https://github.com/gSpotx2f/packages-openwrt/raw/master"
PKG_DIR="/tmp" PKG_DIR="/tmp"
ruantiblock-mod-lua/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock-mod-lua PKG_NAME:=ruantiblock-mod-lua
PKG_VERSION:=0.9.1 PKG_VERSION:=0.9.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua
-1
View File
@@ -63,7 +63,6 @@ local Config = Class(nil, {
["ZI_ALL_URL"] = true, ["ZI_ALL_URL"] = true,
["AF_IP_URL"] = true, ["AF_IP_URL"] = true,
["AF_FQDN_URL"] = true, ["AF_FQDN_URL"] = true,
["AZ_ENCODING"] = true,
["RBL_ENCODING"] = true, ["RBL_ENCODING"] = true,
["ZI_ENCODING"] = true, ["ZI_ENCODING"] = true,
["AF_ENCODING"] = true, ["AF_ENCODING"] = true,
ruantiblock-mod-py/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock-mod-py PKG_NAME:=ruantiblock-mod-py
PKG_VERSION:=0.9.1 PKG_VERSION:=0.9.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py
+1 -2
View File
@@ -47,7 +47,6 @@ class Config:
"ZI_ALL_URL", "ZI_ALL_URL",
"AF_IP_URL", "AF_IP_URL",
"AF_FQDN_URL", "AF_FQDN_URL",
"AZ_ENCODING",
"RBL_ENCODING", "RBL_ENCODING",
"ZI_ENCODING", "ZI_ENCODING",
"AF_ENCODING", "AF_ENCODING",
@@ -149,7 +148,7 @@ class BlackListParser(Config):
self.url = "http://127.0.0.1" self.url = "http://127.0.0.1"
self.records_separator = "\n" self.records_separator = "\n"
self.fields_separator = ";" self.fields_separator = ";"
self.ips_separator = " | " self.ips_separator = "|"
self.default_site_encoding = "utf-8" self.default_site_encoding = "utf-8"
self.site_encoding = self.default_site_encoding self.site_encoding = self.default_site_encoding
ruantiblock/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock PKG_NAME:=ruantiblock
PKG_VERSION:=0.9.1 PKG_VERSION:=0.9.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ruantiblock/files/etc/config/ruantiblock
+4 -4
View File
@@ -2,7 +2,7 @@
config main 'config' config main 'config'
option proxy_mode '1' option proxy_mode '1'
option proxy_local_clients '1' option proxy_local_clients '1'
option ipset_clear_sets '0' option ipset_clear_sets '1'
option if_vpn 'tun0' option if_vpn 'tun0'
option tor_trans_port '9040' option tor_trans_port '9040'
option onion_dns_addr '127.0.0.1#9053' option onion_dns_addr '127.0.0.1#9053'
@@ -11,9 +11,9 @@ config main 'config'
option def_total_proxy '0' option def_total_proxy '0'
option bllist_source 'zapret-info' option bllist_source 'zapret-info'
option bllist_mode 'ip' option bllist_mode 'ip'
option ip_limit '0' option ip_limit '30'
option summarize_ip '0' option summarize_ip '1'
option summarize_cidr '0' option summarize_cidr '1'
option ip_filter '0' option ip_filter '0'
option sd_limit '16' option sd_limit '16'
list opt_exclude_sld 'livejournal.com' list opt_exclude_sld 'livejournal.com'
ruantiblock/files/etc/ruantiblock/ruantiblock.conf
-1
View File
@@ -104,7 +104,6 @@ ZI_ALL_URL="https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv"
#ZI_ALL_URL="https://app.assembla.com/spaces/z-i/git/source/master/dump.csv?_format=raw" #ZI_ALL_URL="https://app.assembla.com/spaces/z-i/git/source/master/dump.csv?_format=raw"
AF_IP_URL="https://antifilter.download/list/allyouneed.lst" AF_IP_URL="https://antifilter.download/list/allyouneed.lst"
AF_FQDN_URL="https://antifilter.download/list/domains.lst" AF_FQDN_URL="https://antifilter.download/list/domains.lst"
AZ_ENCODING=""
RBL_ENCODING="" RBL_ENCODING=""
ZI_ENCODING="CP1251" ZI_ENCODING="CP1251"
AF_ENCODING="" AF_ENCODING=""