Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6052 from stangri/master-luci-app-simple-adblock

Browse source 
luci-app-simple-adblock: bugfix: identify nft set support
This commit is contained in:
Stan Grishin 2022-10-24 10:41:23 -07:00 committed by GitHub
commit 1738749188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-simple-adblock/Makefile
View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=1.9.0-1
PKG_VERSION:=1.9.2-3
LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.

6
applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
View file

@ -52,7 +52,7 @@ function checkIpset()
end
function checkNftset()
if sys.call("command -v nft") == 0 then
if sys.call("command -v nft >/dev/null 2>&1") == 0 then
return true
else
return false
@ -319,10 +319,10 @@ if checkDnsmasq() then
dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts"))
dns:value("dnsmasq.conf", translate("DNSMASQ Config"))
if checkDnsmasqIpset() then
dns:value("dnsmasq.ipset", translate("DNSMASQ IP Set"))
dns:value("dnsmasq.ipset", translate("DNSMASQ Ipset"))
end
if checkDnsmasqNftset() then
dns:value("dnsmasq.nftset", translate("DNSMASQ NFT Set"))
dns:value("dnsmasq.nftset", translate("DNSMASQ Nft Set"))
end
dns:value("dnsmasq.servers", translate("DNSMASQ Servers File"))
end

5
applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
View file

@ -103,11 +103,11 @@ msgid "DNSMASQ Config"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:322
msgid "DNSMASQ IP Set"
msgid "DNSMASQ Ipset"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:325
msgid "DNSMASQ NFT Set"
msgid "DNSMASQ Nft Set"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:327
@ -289,7 +289,6 @@ msgid "Service Status [%s %s]"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua:4
#: applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json:3
msgid "Simple AdBlock"
msgstr ""