up adguardhome16

This commit is contained in:
sirpdboy 2021-04-24 16:16:15 +08:00
parent 395e7296e2
commit 60a04c09d5
6 changed files with 16 additions and 5 deletions

View File

@ -17,7 +17,7 @@ define Package/luci-app-adguardhome
TITLE:=LuCI app for adguardhome
PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
PKGARCH:=all
DEPENDS:=+!wget&&!curl:wget
DEPENDS:=+!wget-ssl&&!curl:wget-ssl
endef
define Package/luci-app-adguardhome/description

View File

@ -3,7 +3,7 @@ config AdGuardHome 'AdGuardHome'
option httpport '3000'
option redirect 'none'
option configpath '/etc/AdGuardHome.yaml'
option workdir '/usr/bin/AdGuardHome'
option workdir '/tmp/AdGuardHome'
option logfile '/tmp/AdGuardHome.log'
option verbose '0'
option binpath '/usr/bin/AdGuardHome/AdGuardHome'

View File

@ -20,7 +20,7 @@ if [ ! -f "$configpath" ]; then
echo "please make a config first"
exit 1
fi
wget-ssl --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O- | base64 -d > /tmp/gfwlist.txt
wget --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O- | base64 -d > /tmp/gfwlist.txt
cat /tmp/gfwlist.txt | awk -v upst="$gfwupstream" 'BEGIN{getline;}{
s1=substr($0,1,1);
if (s1=="!")

View File

@ -15,7 +15,7 @@ check_if_already_running(){
check_wgetcurl(){
which curl && downloader="curl -L -k --retry 2 --connect-timeout 20 -o" && return
which wget-ssl && downloader="wget-ssl --no-check-certificate -t 2 -T 20 -O" && return
which wget && downloader="wget --no-check-certificate -t 2 -T 20 -O" && return
[ -z "$1" ] && opkg update || (echo error opkg && EXIT 1)
[ -z "$1" ] && (opkg remove wget wget-nossl --force-depends ; opkg install wget ; check_wgetcurl 1 ;return)
[ "$1" == "1" ] && (opkg install curl ; check_wgetcurl 2 ; return)

View File

@ -0,0 +1,11 @@
{
"luci-app-adguardhome": {
"description": "Grant UCI access for luci-app-adguardhome",
"read": {
"uci": [ "AdGuardHome" ]
},
"write": {
"uci": [ "AdGuardHome" ]
}
}
}

View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk
PKG_NAME:=luci-app-advanced
PKG_VERSION:=1.9
PKG_RELEASE:=3
PKG_RELEASE:=4
define Package/$(PKG_NAME)
SECTION:=luci
CATEGORY:=LuCI