summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonathan Bennett <JBennett@incomsystems.biz>2015-05-22 12:48:06 -0500
committerJonathan Bennett <JBennett@incomsystems.biz>2015-05-22 12:48:06 -0500
commit30b8097f65b13b45b17ffebc0b10dd9fe2855d9b (patch)
tree686344889442d013bb47fdf7e45294e6f593c206
parent4ccb221f6d3455abb66e93aafdd5b6ea65859a70 (diff)
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
-rw-r--r--applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd12
1 files changed, 5 insertions, 7 deletions
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