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

autoinstall.sh, minor fixes.

Browse Source
This commit is contained in:
gSpot
2024-11-14 00:18:04 +03:00
parent 9fe31af96c
commit 9574313c74
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoinstall/2.x/autoinstall.sh
+1 -1
View File
@@ -224,7 +224,7 @@ InstallTorConfig() {
$UCI_CMD set ruantiblock.config.proxy_mode="1" $UCI_CMD set ruantiblock.config.proxy_mode="1"
$UCI_CMD commit ruantiblock $UCI_CMD commit ruantiblock
# dnsmasq rebind protection # dnsmasq rebind protection
$UCI_CMD set dhcp.@dnsmasq[0].rebind_domain='onion' $UCI_CMD add_list dhcp.@dnsmasq[0].rebind_domain='onion'
$UCI_CMD commit dhcp $UCI_CMD commit dhcp
} }
autoinstall/current/autoinstall.sh
+1 -1
View File
@@ -218,7 +218,7 @@ InstallTorConfig() {
TorrcSettings TorrcSettings
$UCI_CMD set ruantiblock.config.proxy_mode="1" $UCI_CMD set ruantiblock.config.proxy_mode="1"
$UCI_CMD commit ruantiblock $UCI_CMD commit ruantiblock
$UCI_CMD set dhcp.@dnsmasq[0].rebind_domain='onion' $UCI_CMD add_list dhcp.@dnsmasq[0].rebind_domain='onion'
$UCI_CMD commit dhcp $UCI_CMD commit dhcp
} }
luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/log-base.js
+8 -8
View File
@@ -206,14 +206,14 @@ return baseclass.extend({
}, },
logLevels : { logLevels : {
'emerg' : E('span', { 'class': 'zonebadge log-emerg' }, E('strong', _('Emergency'))), 'emerg' : E('span', { 'class': 'zonebadge log-emerg' }, E('strong', 'Emergency')),
'alert' : E('span', { 'class': 'zonebadge log-alert' }, E('strong', _('Alert'))), 'alert' : E('span', { 'class': 'zonebadge log-alert' }, E('strong', 'Alert')),
'crit' : E('span', { 'class': 'zonebadge log-crit' }, E('strong', _('Critical'))), 'crit' : E('span', { 'class': 'zonebadge log-crit' }, E('strong', 'Critical')),
'err' : E('span', { 'class': 'zonebadge log-err' }, E('strong', _('Error'))), 'err' : E('span', { 'class': 'zonebadge log-err' }, E('strong', 'Error')),
'warn' : E('span', { 'class': 'zonebadge log-warn' }, E('strong', _('Warning'))), 'warn' : E('span', { 'class': 'zonebadge log-warn' }, E('strong', 'Warning')),
'notice': E('span', { 'class': 'zonebadge log-notice' }, E('strong', _('Notice'))), 'notice': E('span', { 'class': 'zonebadge log-notice' }, E('strong', 'Notice')),
'info' : E('span', { 'class': 'zonebadge log-info' }, E('strong', _('Info'))), 'info' : E('span', { 'class': 'zonebadge log-info' }, E('strong', 'Info')),
'debug' : E('span', { 'class': 'zonebadge log-debug' }, E('strong', _('Debug'))), 'debug' : E('span', { 'class': 'zonebadge log-debug' }, E('strong', 'Debug')),
}, },
tailValue : 25, tailValue : 25,
ruantiblock/files/usr/share/ruantiblock/nft_functions
+1 -1
View File
@@ -182,7 +182,7 @@ NftInstanceAdd() {
NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_BLLIST_CHAIN" ip daddr "@${NFTSET_ONION}${_name}" counter goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\" NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_BLLIST_CHAIN" ip daddr "@${NFTSET_ONION}${_name}" counter goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\"
fi fi
if [ "$_enable_fproxy" = "1" ]; then if [ "$_enable_fproxy" = "1" ]; then
NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_FPROXY_CHAIN" ip saddr "@${NFTSET_FPROXY}${_name}" goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\" NftCmdWrapper $NFT_CMD add rule $NFT_TABLE "$NFT_FPROXY_CHAIN" ip saddr "@${NFTSET_FPROXY}${_name}" counter goto "${NFT_MARK_CHAIN}${_name}" comment \""$_inst"\"
fi fi
for _set in "${NFTSET_CIDR}${_name}" "${NFTSET_IP}${_name}" for _set in "${NFTSET_CIDR}${_name}" "${NFTSET_IP}${_name}"