Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary

Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>

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 a7c433f..689bedc 100644 (file)
--- 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
 
        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
 rm -f /tmp/luci-indexcache
 exit 0