X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-statistics%2Froot%2Fusr%2Fbin%2Fstat-genconfig;h=86773b4e589b6f908b69e28a8e9fb3ed4407499b;hp=071cff2ca5859a5c67e7861c854865c542b1109a;hb=ccdc6535a9e1eefa109bc491a204e32281d13063;hpb=91ba7c42f5b45614c9f4c803d09399f08a8e27b1

diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
index 071cff2ca..86773b4e5 100755
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -9,7 +9,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
 $Id$
 
@@ -25,6 +25,11 @@ local uci = luci.model.uci.cursor()
 local sections = uci:get_all( "luci_statistics" )
 
 
+function print(...)
+	nixio.stdout:write(...)
+	nixio.stdout:write("\n")
+end
+
 function section( plugin )
 
 	local config = sections[ "collectd_" .. plugin ] or sections["collectd"]
@@ -94,11 +99,17 @@ function config_exec( c )
 		for key, type in pairs({ Exec="collectd_exec_input", NotificationExec="collectd_exec_notify" }) do
 			if sections[s][".type"] == type then
 
-				cmd   = sections[s].cmdline
-				user  = sections[s].cmduser  or "nobody"
-				group = sections[s].cmdgroup or "nogroup"
+				cmd = sections[s].cmdline
+
+				if cmd then
+					cmd   = cmd:gsub("^%s+", ""):gsub("%s+$", "")
+					user  = sections[s].cmduser  or "nobody"
+					group = sections[s].cmdgroup
 
-				str = str .. "\t" .. key .. " " .. user .. ":" .. group .. ' "' .. cmd .. "\"\n"
+					str = str .. "\t" .. key .. ' "' ..
+						user .. ( group and ":" .. group or "" ) .. '" "' ..
+						cmd:gsub('%s+', '" "') .. '"\n'
+				end
 			end
 		end
 	end
@@ -151,14 +162,14 @@ function config_network( c )
 
 				if host then
 					if port then
-						str = str .. "\t" .. key .. " " .. host .. " " .. port .. "\n"
+						str = str .. "\t" .. key .. " \"" .. host .. "\" \"" .. port .. "\"\n"
 					else
-						str = str .. "\t" .. key .. " " .. host .. "\n"
+						str = str .. "\t" .. key .. " \"" .. host .. "\"\n"
 					end
 				end
-                        end
-                end
-        end
+						end
+				end
+		end
 
 	return str .. _string( c["TimeToLive"], "TimeToLive" )
 		   .. _string( c["CacheFlush"], "CacheFlush" )
@@ -189,15 +200,19 @@ function _list_expand( c, l, nopad )
 end
 
 function _expand( s, n, nopad )
-	if type(s) == "string" then
-		local str = ""
+	local str = ""
 
+	if type(s) == "string" then
 		for i, v in ipairs( luci.util.split( s, "%s+", nil, true ) ) do
 			str = str .. _string( v, n, nopad )
 		end
-
-		return str
+	elseif type(s) == "table" then
+		for i, v in ipairs(s) do
+			str = str .. _string( v, n, nopad )
+		end
 	end
+
+	return str
 end
 
 function _bool( s, n, nopad )
@@ -222,21 +237,21 @@ function _string( s, n, nopad )
 	if not nopad then pad = "\t" end
 
 	if s then
-		if s:find("[^%d]") then
-			if not s:find("[^%w]") then
-				str = pad .. n .. " " .. s
+		if s:find("[^%d]") or n == "Port" then
+			if not s:find("[^%w]") and n ~= "Port" then
+				str = pad .. n .. " " .. luci.util.trim(s)
 			else
-				str = pad .. n .. ' "' .. s .. '"'
+				str = pad .. n .. ' "' .. luci.util.trim(s) .. '"'
 			end
 		else
-			str = pad .. n .. " " .. s
+			str = pad .. n .. " " .. luci.util.trim(s)
 		end
 
 		str = str .. "\n"
 	end
 
 	return str
-end		
+end
 
 
 plugins = {
@@ -246,13 +261,19 @@ plugins = {
 		{ }
 	},
 
+	conntrack = {
+		{ },
+		{ },
+		{ }
+	},
+
 	cpu	= {
 		{ },
 		{ },
 		{ }
 	},
 
-	csv	= { 
+	csv	= {
 		{ "DataDir" },
 		{ "StoreRates" },
 		{ }
@@ -298,6 +319,12 @@ plugins = {
 		{ "Irqs" }
 	},
 
+	iwinfo = {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Interfaces" }
+	},
+
 	load	= {
 		{ },
 		{ },
@@ -310,6 +337,18 @@ plugins = {
 		{ }
 	},
 
+	madwifi = {
+		{ "WatchSet" },
+		{ },
+		{ "Interfaces", "WatchAdds" }
+	},
+
+	memory = { 
+		{ },
+		{ },
+		{ }
+	},
+
 	netlink	= {
 		{ },
 		{ "IgnoreSelected" },
@@ -318,8 +357,20 @@ plugins = {
 
 	network	= config_network,
 
+	nut = {
+		{ "UPS" },
+		{ },
+		{ }
+	},
+
+	olsrd = {
+		{ "Host", "Port", "CollectLinks","CollectRoutes","CollectTopology"},
+		{ },
+		{ }
+	},
+
 	ping	= {
-		{ "TTL" },
+		{ "TTL", "Interval" },
 		{ },
 		{ "Hosts" }
 	},
@@ -336,6 +387,12 @@ plugins = {
 		{ "RRATimespans" }
 	},
 
+        splash_leases = {
+          { },
+          { },
+          { }
+        },
+
 	tcpconns = {
 		{ },
 		{ "ListeningPorts" },
@@ -348,6 +405,12 @@ plugins = {
 		{ }
 	},
 
+	uptime = {
+		{ },
+		{ },
+		{ }
+	},
+
 	wireless = {
 		{ },
 		{ },