From 45be03914c9f6eda8f9fd9f8ce662ef371b7806f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 23 May 2008 20:23:51 +0000 Subject: [PATCH] * ffluci/statistics: move contrib files from files/ to root/ --- .../files/etc/config/luci_statistics | 121 ------------------ .../root/etc/config/luci_statistics | 121 ++++++++++++++++++ .../{files => root}/usr/bin/stat-genconfig | 0 3 files changed, 121 insertions(+), 121 deletions(-) delete mode 100644 applications/luci-statistics/files/etc/config/luci_statistics rename applications/luci-statistics/{files => root}/usr/bin/stat-genconfig (100%) diff --git a/applications/luci-statistics/files/etc/config/luci_statistics b/applications/luci-statistics/files/etc/config/luci_statistics deleted file mode 100644 index b8642b680..000000000 --- a/applications/luci-statistics/files/etc/config/luci_statistics +++ /dev/null @@ -1,121 +0,0 @@ -config 'statistics' 'general' - option 'BaseDir' '/var/run/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 'Interval' '30' - option 'ReadThreads' '2' - -config 'statistics' 'collectd_ping' - option 'enable' '0' - option 'TTL' '127' - option 'Hosts' '127.0.0.1' - -config 'statistics' 'collectd_csv' - option 'enable' '0' - option 'StoreRates' '0' - option 'DataDir' '/tmp' - -config 'statistics' 'collectd_df' - option 'enable' '0' - option 'Devices' '/dev/mtdblock/4' - option 'MountPoints' '/jffs' - option 'FSTypes' 'tmpfs' - option 'IgnoreSelected' '0' - -config 'statistics' 'collectd_disk' - option 'enable' '0' - option 'Disks' 'hda1 hdb' - option 'IgnoreSelected' '0' - -config 'statistics' 'collectd_dns' - option 'enable' '0' - option 'Interfaces' 'ffdhcp ff br-lan' - option 'IgnoreSources' '127.0.0.1' - -config 'statistics' 'collectd_email' - option 'enable' '0' - option 'SocketFile' '/var/run/collectd/email.sock' - option 'SocketGroup' 'nogroup' - -config 'statistics' 'collectd_exec' - option 'enable' '1' - -config 'collectd_exec_input' - option 'cmdline' '/usr/bin/stat-input-olsr' - -config 'collectd_exec_notify' - option 'cmdline' '/usr/bin/stat-output-syslog' - -config 'statistics' 'collectd_interface' - option 'enable' '1' - option 'Interfaces' 'br-lan br-ff' - option 'IgnoreSelected' '0' - -config 'statistics' 'collectd_iptables' - option 'enable' '1' - -config 'collectd_iptables_match' - option 'table' 'nat' - option 'chain' 'luci_freifunk_postrouting' - option 'target' 'MASQUERADE' - option 'source' '192.168.1.0/24' - option 'outputif' 'br-ff' - option 'name' 'Verkehr LAN-Clients' - -config 'collectd_iptables_match' - option 'chain' 'luci_freifunk_postrouting' - option 'table' 'nat' - option 'target' 'MASQUERADE' - option 'source' '10.61.230.0/24' - option 'outputif' 'br-ff' - option 'name' 'Verkehr WLAN-Clients' - -config 'statistics' 'collectd_irq' - option 'enable' '0' - option 'Irqs' '2 3 4 7' - -config 'statistics' 'collectd_logfile' - option 'enable' '0' - option 'LogLevel' 'notice' - option 'File' '/var/log/collectd.log' - option 'Timestamp' '1' - -config 'statistics' 'collectd_netlink' - option 'enable' '1' - option 'IgnoreSelected' '0' - option 'VerboseInterfaces' 'br-lan br-ff' - option 'QDiscs' 'br-lan br-ff' - -config 'statistics' 'collectd_network' - option 'enable' '0' - -config 'collectd_network_listen' - option 'host' '0.0.0.0' - -config 'collectd_network_server' - option 'host' '0.0.0.0' - -config 'statistics' 'collectd_processes' - option 'enable' '1' - -config 'statistics' 'collectd_tcpconns' - option 'enable' '1' - option 'ListeningPorts' '0' - option 'LocalPorts' '22 80 443' - -config 'statistics' 'collectd_unixsock' - option 'enable' '0' - option 'SocketFile' '/var/run/collectd/query.sock' - option 'SocketGroup' 'nogroup' - -config 'statistics' 'collectd_wireless' - option 'enable' '1' - -config 'statistics' 'collectd_rrdtool' - option 'enable' '1' - option 'DataDir' '/tmp' - option 'RRARows' '100' - option 'RRASingle' '1' - option 'RRATimespans' '600 86400 604800 2678400' diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics index e69de29bb..b8642b680 100644 --- a/applications/luci-statistics/root/etc/config/luci_statistics +++ b/applications/luci-statistics/root/etc/config/luci_statistics @@ -0,0 +1,121 @@ +config 'statistics' 'general' + option 'BaseDir' '/var/run/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 'Interval' '30' + option 'ReadThreads' '2' + +config 'statistics' 'collectd_ping' + option 'enable' '0' + option 'TTL' '127' + option 'Hosts' '127.0.0.1' + +config 'statistics' 'collectd_csv' + option 'enable' '0' + option 'StoreRates' '0' + option 'DataDir' '/tmp' + +config 'statistics' 'collectd_df' + option 'enable' '0' + option 'Devices' '/dev/mtdblock/4' + option 'MountPoints' '/jffs' + option 'FSTypes' 'tmpfs' + option 'IgnoreSelected' '0' + +config 'statistics' 'collectd_disk' + option 'enable' '0' + option 'Disks' 'hda1 hdb' + option 'IgnoreSelected' '0' + +config 'statistics' 'collectd_dns' + option 'enable' '0' + option 'Interfaces' 'ffdhcp ff br-lan' + option 'IgnoreSources' '127.0.0.1' + +config 'statistics' 'collectd_email' + option 'enable' '0' + option 'SocketFile' '/var/run/collectd/email.sock' + option 'SocketGroup' 'nogroup' + +config 'statistics' 'collectd_exec' + option 'enable' '1' + +config 'collectd_exec_input' + option 'cmdline' '/usr/bin/stat-input-olsr' + +config 'collectd_exec_notify' + option 'cmdline' '/usr/bin/stat-output-syslog' + +config 'statistics' 'collectd_interface' + option 'enable' '1' + option 'Interfaces' 'br-lan br-ff' + option 'IgnoreSelected' '0' + +config 'statistics' 'collectd_iptables' + option 'enable' '1' + +config 'collectd_iptables_match' + option 'table' 'nat' + option 'chain' 'luci_freifunk_postrouting' + option 'target' 'MASQUERADE' + option 'source' '192.168.1.0/24' + option 'outputif' 'br-ff' + option 'name' 'Verkehr LAN-Clients' + +config 'collectd_iptables_match' + option 'chain' 'luci_freifunk_postrouting' + option 'table' 'nat' + option 'target' 'MASQUERADE' + option 'source' '10.61.230.0/24' + option 'outputif' 'br-ff' + option 'name' 'Verkehr WLAN-Clients' + +config 'statistics' 'collectd_irq' + option 'enable' '0' + option 'Irqs' '2 3 4 7' + +config 'statistics' 'collectd_logfile' + option 'enable' '0' + option 'LogLevel' 'notice' + option 'File' '/var/log/collectd.log' + option 'Timestamp' '1' + +config 'statistics' 'collectd_netlink' + option 'enable' '1' + option 'IgnoreSelected' '0' + option 'VerboseInterfaces' 'br-lan br-ff' + option 'QDiscs' 'br-lan br-ff' + +config 'statistics' 'collectd_network' + option 'enable' '0' + +config 'collectd_network_listen' + option 'host' '0.0.0.0' + +config 'collectd_network_server' + option 'host' '0.0.0.0' + +config 'statistics' 'collectd_processes' + option 'enable' '1' + +config 'statistics' 'collectd_tcpconns' + option 'enable' '1' + option 'ListeningPorts' '0' + option 'LocalPorts' '22 80 443' + +config 'statistics' 'collectd_unixsock' + option 'enable' '0' + option 'SocketFile' '/var/run/collectd/query.sock' + option 'SocketGroup' 'nogroup' + +config 'statistics' 'collectd_wireless' + option 'enable' '1' + +config 'statistics' 'collectd_rrdtool' + option 'enable' '1' + option 'DataDir' '/tmp' + option 'RRARows' '100' + option 'RRASingle' '1' + option 'RRATimespans' '600 86400 604800 2678400' diff --git a/applications/luci-statistics/files/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig similarity index 100% rename from applications/luci-statistics/files/usr/bin/stat-genconfig rename to applications/luci-statistics/root/usr/bin/stat-genconfig -- 2.25.1