Changeset 5703

Timestamp:

03/01/10 01:46:32 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5693 and r5697

Location:

luci/branches/luci-0.9/applications/luci-statistics/root/etc

Files:

• config/luci_statistics (modified) (1 diff)
• init.d/luci_statistics (modified) (2 diffs)
• uci-defaults/luci-statistics (modified) (1 diff)

luci/branches/luci-0.9/applications/luci-statistics/root/etc/config/luci_statistics

@@ -9 +9 @@
     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'

luci/branches/luci-0.9/applications/luci-statistics/root/etc/init.d/luci_statistics

@@ -1 +1 @@
 #!/bin/sh /etc/rc.common
 START=79
-
-boot() {
-    ### prepare publisher
-    if ! uci get lucid.rrdimg >/dev/null 2>/dev/null; then
-        uci batch <<-EOF
-set lucid.rrdimg=DirectoryPublisher
-set lucid.rrdimg.name='Statistics Images'
-set lucid.rrdimg.physical=/tmp/rrdimg
-set lucid.rrdimg.virtual=/rrdimg
-set lucid.rrdimg.domain=''
-
-add_list lucid.http.publisher=rrdimg
-add_list lucid.https.publisher=rrdimg   
-
-commit lucid
-EOF
-        /etc/init.d/lucid restart
-    fi
-
-    start
-}
 
 start() {
@@ -35 +14 @@
 
     ### prepare rrdimg directory
-    if [ "$(uci get luci_statistics.rrdtool.image_path 2>/dev/null)" != "$(uci get lucid.rrdimg.physical 2>/dev/null)" ]; then
-        uci set lucid.rrdimg.physical=$(uci get luci_statistics.rrdtool.image_path)
+    if [ -f /etc/config/lucid ] && [ -x /etc/init.d/lucid ] && /etc/init.d/lucid enabled && \
+       [ "$(uci get luci_statistics.rrdtool.image_path 2>/dev/null)" != "$(uci get lucid.statistics.physical 2>/dev/null)" ]; then
+        uci set lucid.statistics.physical=$(uci get luci_statistics.rrdtool.image_path)
         uci commit lucid
         /etc/init.d/lucid restart
     fi
-
-    ### flush LuCI index cache
-    test -f /var/luci-indexcache && rm /var/luci-indexcache
 
     ### workaround broken permissions on /tmp

luci/branches/luci-0.9/applications/luci-statistics/root/etc/uci-defaults/luci-statistics

@@ -1 +1 @@
 #!/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