diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-04-02 18:45:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 18:45:16 +0300 |
| commit | 7f77a3129363fc0e338dd2d36d591ba14d9c3c56 (patch) | |
| tree | 3588b496018623fd2d9ea2877af5a8a3a61ea88e | |
| parent | 38e36f2d826303fa06ac7a649ae5e69bd488d7a7 (diff) | |
| parent | 2561f2a85ad65027c84aded1ab304c7e5d3d2902 (diff) | |
Merge pull request #1710 from guidosarducci/lede-17.01-fix-luci-fwknopd
luci-app-fwknop: backport a check to not overwrite user configured keys
| -rw-r--r-- | applications/luci-app-fwknopd/Makefile | 2 | ||||
| -rw-r--r-- | applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/applications/luci-app-fwknopd/Makefile b/applications/luci-app-fwknopd/Makefile index 3fbd88ad61..6df5a47406 100644 --- a/applications/luci-app-fwknopd/Makefile +++ b/applications/luci-app-fwknopd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon LUCI_DEPENDS:=+fwknopd +qrencode PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz> include ../../luci.mk diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd index 65ef012450..9e5057e701 100644 --- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd +++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd @@ -3,6 +3,7 @@ #-- Licensed to the public under the GNU General Public License v2. . /lib/functions/network.sh +[ "$(uci -q get fwknopd.@access[0].KEY)" != "CHANGEME" ] && exit 0 uci batch <<EOF add ucitrack fwknopd set ucitrack.@fwknopd[-1].init=fwknopd |