* luci/statistics: fix path to types.db in default config, adept stat-genconfig to...

diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics
index 9636c57f88b746bdc0068f76d9fe3427516e21b8..db5bb577e1cf342f6734d02e41dc0cf935a73ca6 100644 (file)
--- a/applications/luci-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-statistics/root/etc/config/luci_statistics
@@ -3,7 +3,7 @@ config 'statistics' 'collectd'
        option 'Include' '/etc/collectd/conf.d'
        option 'PIDFile' '/var/run/collectd.pid'
        option 'PluginDir' '/usr/lib/collectd'
-       option 'TypesDB' '/etc/collectd/types.db'
+       option 'TypesDB' '/usr/lib/collectd/types.db'
        option 'Interval' '30'
        option 'ReadThreads' '2'
 

diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
index 39532ca07414b83c169bb7f90b470aef8e619dd3..115eab1f9f86edb4eb38a04fa8230f5434189479 100755 (executable)
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -16,31 +16,31 @@ $Id$
 ]]--
 
 
-require("ffluci.model.uci")
-require("ffluci.sys.iptparser")
-require("ffluci.util")
+require("luci.model.uci")
+require("luci.sys.iptparser")
+require("luci.util")
 
-local ipt = ffluci.sys.iptparser.IptParser()
-local uci = ffluci.model.uci.Session()
+local ipt = luci.sys.iptparser.IptParser()
+local uci = luci.model.uci.Session()
 local sections, names = uci:sections( "luci_statistics" )
 
 
 function section( plugin )
 
-       local config = sections[ "collectd_" .. plugin ] or sections["general"]
+       local config = sections[ "collectd_" .. plugin ] or sections["collectd"]
 
-       if type(config) == "table" and ( plugin == "general" or config.enable == "1" ) then
+       if type(config) == "table" and ( plugin == "collectd" or config.enable == "1" ) then
 
                local params = ""
 
                if type( plugins[plugin] ) == "function" then
                        params = plugins[plugin]( config )
                else
-                       params = config_generic( config, plugins[plugin][1], plugins[plugin][2], plugins[plugin][3], plugin == "general" )
+                       params = config_generic( config, plugins[plugin][1], plugins[plugin][2], plugins[plugin][3], plugin == "collectd" )
                end
 
 
-               if plugin ~= "general" then
+               if plugin ~= "collectd" then
                        print( "LoadPlugin " .. plugin )
 
                        if params:len() > 0 then
@@ -113,7 +113,7 @@ function config_iptables( c )
                                v = sections[s][k]
 
                                if type(v) == "string" then
-                                       if k == "options" then v = ffluci.util.split( v, "%s+", nil, true ) end
+                                       if k == "options" then v = luci.util.split( v, "%s+", nil, true ) end
                                        search[k] = v
                                end
                        end
@@ -180,7 +180,7 @@ function _expand( s, n, nopad )
        if type(s) == "string" then
                local str = ""
 
-               for i, v in ipairs( ffluci.util.split( s, "%s+", nil, true ) ) do
+               for i, v in ipairs( luci.util.split( s, "%s+", nil, true ) ) do
                        str = str .. _string( v, n, nopad )
                end
 
@@ -228,7 +228,7 @@ end
 
 
 plugins = {
-       general = {
+       collectd = {
                { "BaseDir", "Include", "PIDFile", "PluginDir", "TypesDB", "Interval", "ReadThreads" },
                { },
                { }
@@ -333,10 +333,10 @@ plugins = {
 }
 
 
-section("general")
+section("collectd")
 
 for plugin in pairs(plugins) do
-       if plugin ~= "general" then
+       if plugin ~= "collectd" then
                section( plugin )
        end
 end