From 56b3fb4ef779b9f3fa76ad6786b02ad02eff975a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 28 Feb 2010 00:19:58 +0000 Subject: applications/luci-statistics: make it run ootb again --- .../root/etc/config/luci_statistics | 2 +- .../root/etc/uci-defaults/luci-statistics | 30 +++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) (limited to 'applications') diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics index f6d870e05..f418f1926 100644 --- a/applications/luci-statistics/root/etc/config/luci_statistics +++ b/applications/luci-statistics/root/etc/config/luci_statistics @@ -8,7 +8,7 @@ config 'statistics' 'collectd' option 'Include' '/etc/collectd/conf.d' option 'PIDFile' '/var/run/collectd.pid' option 'PluginDir' '/usr/lib/collectd' - option 'TypesDB' '/usr/lib/collectd/types.db' + option 'TypesDB' '/usr/share/collectd/types.db' option 'Interval' '30' option 'ReadThreads' '2' diff --git a/applications/luci-statistics/root/etc/uci-defaults/luci-statistics b/applications/luci-statistics/root/etc/uci-defaults/luci-statistics index f89366f1b..9453dc1d0 100644 --- a/applications/luci-statistics/root/etc/uci-defaults/luci-statistics +++ b/applications/luci-statistics/root/etc/uci-defaults/luci-statistics @@ -1,7 +1,35 @@ #!/bin/sh -uci batch <<-EOF +# register commit handler +[ -f /etc/config/ucitrack ] && \ +[ "$(uci get ucitrack.@luci_statistics[0] 2>/dev/null)" != "luci_statistics" ] && \ +uci batch <<-EOF >/dev/null 2>/dev/null add ucitrack luci_statistics set ucitrack.@luci_statistics[-1].init=luci_statistics commit ucitrack EOF + +# register LuCId virtual path handler +[ -f /etc/config/lucid ] && \ +[ "$(uci get lucid.statistics 2>/dev/null)" != "DirectoryPublisher" ] && \ +uci batch <<-EOF >/dev/null 2>/dev/null + set lucid.statistics=DirectoryPublisher + set lucid.statistics.name='RRDTool Image Cache' + set lucid.statistics.physical=/tmp/rrdimg + set lucid.statistics.virtual=/rrdimg + set lucid.statistics.domain='' + + add_list lucid.http.publisher=statistics + add_list lucid.https.publisher=statistics + + commit lucid +EOF + +# symlink for busybox httpd +[ -x /usr/sbin/httpd ] && [ ! -h /www/rrdimg ] && \ + ln -s /tmp/rrdimg /www/rrdimg + +# restart LuCId service +[ -x /etc/init.d/lucid ] && /etc/init.d/lucid enabled && /etc/init.d/lucid restart + +exit 0 -- cgit v1.2.3