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

Merge pull request #1710 from guidosarducci/lede-17.01-fix-luci-fwknopd

Browse source 
luci-app-fwknop:  backport a check to not overwrite user configured keys
This commit is contained in:
Hannu Nyman 2018-04-02 18:45:16 +03:00 committed by GitHub
commit 7f77a31293
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-fwknopd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon
LUCI_DEPENDS:=+fwknopd +qrencode LUCI_DEPENDS:=+fwknopd +qrencode
PKG_VERSION:=1.0 PKG_VERSION:=1.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2
PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz> PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
include ../../luci.mk include ../../luci.mk

1
applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
View file

@ -3,6 +3,7 @@
#-- Licensed to the public under the GNU General Public License v2. #-- Licensed to the public under the GNU General Public License v2.
. /lib/functions/network.sh . /lib/functions/network.sh
[ "$(uci -q get fwknopd.@access[0].KEY)" != "CHANGEME" ] && exit 0
uci batch <<EOF uci batch <<EOF
add ucitrack fwknopd add ucitrack fwknopd
set ucitrack.@fwknopd[-1].init=fwknopd set ucitrack.@fwknopd[-1].init=fwknopd