summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-05-26 17:14:24 +0200
committerJo-Philipp Wich <jow@openwrt.org>2015-05-26 17:14:24 +0200
commitd6d0926aee1205b9ade0cb5b7462603a98b938af (patch)
tree44cd42b042683794590b883596ead2b4526c7a36
parentfe14cd5a66a26423adcfb2366c1b9e643024fd46 (diff)
parent30b8097f65b13b45b17ffebc0b10dd9fe2855d9b (diff)
Merge pull request #388 from oneru/fwknop-qr
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
-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 a7c433f2b..689bedcd1 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