application/luci-ffwizard-leipzig: don't write system hostname to olsrd config, will...

[project/luci.git] / applications / luci-ffwizard-leipzig / luasrc / model / cbi / ffwizard.lua

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index f092a60..b30b596 100644 (file)
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -217,7 +217,7 @@ function main.write(self, section, value)
 
        if not has_advanced then
                uci:section("firewall", "advanced", nil,
-                       { tcp_ecn = "0" })
+                       { tcp_ecn = "0", ip_conntrack_max = "8192", tcp_westwood = "1" })
        end
 
        uci:save("firewall")
@@ -262,19 +262,6 @@ function olsr.write(self, section, value)
        local community = net:formvalue(section)
        local external  = community and uci:get("freifunk", community, "external") or ""
 
-       -- Configure nameservice
-       local hostname
-       uci:foreach("system", "system", function(s) hostname = s.hostname end)
-
-       if hostname then
-               uci:foreach("olsrd", "LoadPlugin",
-                       function(s)
-                               if s.library == "olsrd_nameservice.so.0.3" then
-                                       uci:set("olsrd", s['.name'], "name", hostname)
-                               end
-                       end)
-       end
-
        -- Delete old interface
        uci:delete_all("olsrd", "Interface", {interface=device})
 
@@ -284,12 +271,23 @@ function olsr.write(self, section, value)
        olsrbase.interface = device
        olsrbase.ignore    = "0"
        uci:section("olsrd", "Interface", nil, olsrbase)
-       uci:save("olsrd")
+
+       -- Delete old watchdog settings
+       uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_watchdog.so.0.1"})
+
+       -- Write new watchdog settings
+       uci:section("olsrd", "LoadPlugin", nil, {
+               library  = "olsrd_watchdog.so.0.1",
+               file     = "/var/run/olsrd.watchdog",
+               interval = "30"
+       })
 
        -- Import hosts
        uci:foreach("dhcp", "dnsmasq", function(s)
                uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
        end)
+
+       uci:save("olsrd")
        uci:save("dhcp")
 end
 
@@ -349,6 +347,7 @@ function client.write(self, section, value)
        dhcpbase.interface = device .. "dhcp"
        dhcpbase.start = dhcpbeg
        dhcpbase.limit = limit
+       dhcpbase.force = 1
 
        uci:section("dhcp", "dhcp", device .. "dhcp", dhcpbase)
        uci:save("dhcp")
@@ -392,10 +391,10 @@ function client.write(self, section, value)
 
 
        -- Delete old splash
-       uci:delete_all("luci_splash", "iface", {net=device, zone="freifunk"})
+       uci:delete_all("luci_splash", "iface", {network=device.."dhcp", zone="freifunk"})
 
        -- Register splash
-       uci:section("luci_splash", "iface", nil, {net=device, zone="freifunk"})
+       uci:section("luci_splash", "iface", nil, {network=device.."dhcp", zone="freifunk"})
        uci:save("luci_splash")
 end