Merge pull request #461 from marcel-sch/patch-1

[project/luci.git] / protocols / luci-proto-ipv6 / luasrc / model / cbi / admin_network / proto_aiccu.lua

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
index c7629cd..9315dc2 100644 (file)
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
@@ -53,7 +53,7 @@ tunnelid.optional = true
 local ip6prefix = section:taboption("general", Value, "ip6prefix",
        translate("IPv6 prefix"),
        translate("Routed IPv6 prefix for downstream interfaces"))
-ip6prefix.datatype = "ip6prefix"
+ip6prefix.datatype = "ip6addr"
 ip6prefix.optional = true
 
 
@@ -69,21 +69,21 @@ nat = section:taboption("general", Flag, "nat",
        translate("Behind NAT"),
        translate("The tunnel end-point is behind NAT, defaults to disabled and only applies to AYIYA"))
 nat.optional = true
-nat.default = disabled
+nat.default = nat.disabled
 
 
 requiretls = section:taboption("general", Flag, "requiretls",
        translate("Require TLS"),
        translate("Connection to server fails when TLS cannot be used"))
 requiretls.optional = true
-requiretls.default = requiretls.enabled
+requiretls.default = requiretls.disabled
 
 
 verbose = section:taboption("advanced", Flag, "verbose",
        translate("Verbose"),
        translate("Verbose logging by aiccu daemon"))
 verbose.optional = true
-verbose.default = disabled
+verbose.default = verbose.disabled
 
 
 ntpsynctimeout = section:taboption("advanced", Value, "ntpsynctimeout",