From: Oldřich Jedlička Date: Thu, 15 Oct 2020 16:59:19 +0000 (+0200) Subject: luci-app-fwknopd: Remove defaults. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6059f6a1a697f7b1924505183757b4e6d2f8985b;p=project%2Fluci.git luci-app-fwknopd: Remove defaults. Remove setting values in `uci-defaults`, which can be changed from LuCI directly: * Keys can be generated from LuCI, so it is not necessary to set them. * ENABLE_IPT_FORWARDING and ENABLE_NAT_DNS options can be set in LuCI. Signed-off-by: Oldřich Jedlička --- diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd index 00d721e067..5fed1889da 100644 --- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd +++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd @@ -11,16 +11,4 @@ if uci -q show fwknopd | grep \\.h\\?keytype > /dev/null; then uci commit fwknopd fi -# Generate valid keys -if [ "$(uci -q get fwknopd.@access[0].KEY)" = "CHANGEME" ]; then - uci delete fwknopd.@access[0].KEY - uci delete fwknopd.@access[0].HMAC_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 set fwknopd.@config[0].ENABLE_IPT_FORWARDING='y' - uci set fwknopd.@config[0].ENABLE_NAT_DNS='y' - - uci commit fwknopd -fi - exit 0