Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary
authorJonathan Bennett <JBennett@incomsystems.biz>
Fri, 22 May 2015 17:48:06 +0000 (12:48 -0500)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 26 May 2015 15:15:48 +0000 (17:15 +0200)
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd

index a7c433f2bc9e65d9b6663ba5021e3d12c7abe00d..689bedcd11abf0ce14b64318101a1ff722cbef92 100644 (file)
@@ -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