From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 26 May 2015 15:14:24 +0000 (+0200)
Subject: Merge pull request #388 from oneru/fwknop-qr
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d6d0926aee1205b9ade0cb5b7462603a98b938af;hp=fe14cd5a66a26423adcfb2366c1b9e643024fd46;p=project%2Fluci.git

Merge pull request #388 from oneru/fwknop-qr

Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
---

diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd
index a7c433f2bc..689bedcd11 100644
--- a/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd
+++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd
@@ -8,12 +8,10 @@ uci batch <<EOF
 	commit ucitrack
 EOF
 
-if [ -f /usr/bin/fwknop ]; then
-	uci set fwknopd.@access[0].keytype='Base 64 key'
-	uci set fwknopd.@access[0].hkeytype='Base 64 key'
-	uci set fwknopd.@access[0].KEY_BASE64=`fwknop --key-gen | awk '/^KEY/ {print $2;}'`
-	uci set fwknopd.@access[0].HMAC_KEY_BASE64=`fwknop --key-gen | awk '/^HMAC/ {print $2;}'`
-	uci commit fwknopd
-fi
+uci set fwknopd.@access[0].keytype='Base 64 key'
+uci set fwknopd.@access[0].hkeytype='Base 64 key'
+uci set fwknopd.@access[0].KEY_BASE64=`fwknopd --key-gen | awk '/^KEY/ {print $2;}'`
+uci set fwknopd.@access[0].HMAC_KEY_BASE64=`fwknopd --key-gen | awk '/^HMAC/ {print $2;}'`
+uci commit fwknopd
 rm -f /tmp/luci-indexcache
 exit 0