luci:0.10: Merge r6883, r6884, r6889-r6891

applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua

@@ -1045,15 +1045,6 @@ function main.write(self, section, value)
 			uci:set("system", s['.name'], "zonename", "Europe/Berlin")
 			uci:set("system", s['.name'], "timezone", 'CET-1CEST,M3.5.0,M10.5.0/3')
 		end)
-
-	-- Create time rdate_servers
-	local rdate = uci:get_all("freifunk", "time")
-	uci:delete_all("system", "time")
-	uci:section("system", "time", "rdate_servers", rdate)
-	rdate.server = rdate.rdate_servers
-	rdate.rdate_servers = ""
-	uci:delete_all("system", "rdate", nil)
-	uci:section("system", "rdate", nil, rdate)
 	uci:save("system")
 
 	-- Delete old watchdog settings

modules/admin-full/luasrc/model/cbi/admin_system/system.lua

@@ -97,11 +97,26 @@ s:option(Value, "conloglevel", translate("Log output level")).optional = true
 s:option(Value, "cronloglevel", translate("Cron Log Level")).optional = true
 
 if has_rdate then
-	s2 = m:section(TypedSection, "rdate", translate("Time Server (rdate)"))
-	s2.anonymous = true
-	s2.addremove = false
+	m3 = Map("timeserver", translate("Time Server (rdate)"))
+	s = m3:section(TypedSection, "timeserver")
+	s.anonymous = true
+	s.addremove = true
+	s.template = "cbi/tblsection"
 
-	s2:option(DynamicList, "server", translate("Server"))
+	h = s:option(Value, "hostname", translate("Name"))
+	h.rmempty = true
+	h.datatype = host
+	i = s:option(ListValue, "interface", translate("Interface"))
+	i.rmempty = true
+	i:value("", translate("Default"))
+	m3.uci:foreach("network", "interface",
+		function (section)
+			local ifc = section[".name"]
+			if ifc ~= "loopback" then
+				i:value(ifc)
+			end
+		end
+	)
 end
 
-return m
+return m, m3

modules/freifunk/root/etc/config/freifunk

@@ -82,9 +82,6 @@ config 'defaults' 'dhcp'
 config 'defaults' 'olsr_interface'
 	option 'Ip4Broadcast' '255.255.255.255'
 
-config 'defaults' 'time'
-	option 'rdate_servers' '128.138.140.44 171.64.7.77 171.64.7.99 81.169.154.44 130.133.1.10'
-
 config 'defaults' 'upgrade'
 	option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots'
 	option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml'

modules/freifunk/root/usr/sbin/ff_rdate

@@ -6,8 +6,7 @@ uci_get_one() {
 	done
 }
 
-local servers=$(uci_get_one "network.wan.lease_timesrv" \
-	"system.time.rdate_servers" "freifunk.time.rdate_servers")
+local servers="$(uci_get_one 'network.wan.lease_timesrv') $(uci show timeserver |grep hostname |cut -d '=' -f 2 |tr '\n' ' ')"
 
 if [ -n "$servers" ]; then
 	for server in $servers; do