* luci/app-olsr: fix layout of IpcConnect section

* luci/contrib/olsr: fix default config

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index addb645..0f8bc42 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -121,6 +121,8 @@ adc.optional = true
 
 
 ipc = m:section(TypedSection, "IpcConnect")
 
 
 ipc = m:section(TypedSection, "IpcConnect")

+ipc.anonymous = true
+

 conns = ipc:option(Value, "MaxConnections")
 conns.isInteger = true
 
 conns = ipc:option(Value, "MaxConnections")
 conns.isInteger = true
 

diff --git a/contrib/package/olsrd-luci/files/etc/config/olsrd b/contrib/package/olsrd-luci/files/etc/config/olsrd
index 3cbfa62..4ce5bda 100644 (file)
--- a/contrib/package/olsrd-luci/files/etc/config/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/config/olsrd
@@ -10,14 +10,18 @@ config 'Interface'
 config 'LoadPlugin'
        option 'library' 'olsrd_dyn_gw.so.0.4'
        option 'Ping' '141.1.1.1'
 config 'LoadPlugin'
        option 'library' 'olsrd_dyn_gw.so.0.4'
        option 'Ping' '141.1.1.1'

-#      option 'HNA' '192.168.80.0 255.255.255.0'

        option 'Interval' '60'
 
 config 'LoadPlugin'
        option 'library' 'olsrd_nameservice.so.0.3'
        option 'Interval' '60'
 
 config 'LoadPlugin'
        option 'library' 'olsrd_nameservice.so.0.3'

-       option 'name' 'luci-node.olsr'
+       option 'name' 'luci-node'
+       option 'suffix' '.olsr'
+       option 'hosts_file' '/var/etc/hosts.olsr'

        option 'latlon_file' '/dev/null'
 
 config 'LoadPlugin'
        option 'library' 'olsrd_txtinfo.so.0.1'
        option 'accept' '127.0.0.1'
        option 'latlon_file' '/dev/null'
 
 config 'LoadPlugin'
        option 'library' 'olsrd_txtinfo.so.0.1'
        option 'accept' '127.0.0.1'

+
+config 'IpcConnect'
+    option 'MaxConnections' '0'