summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-statistics
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2015-08-30 14:00:29 +0300
committerHannu Nyman <hannu.nyman@iki.fi>2015-08-30 14:00:29 +0300
commit0d5070c51089deb448476f1abadcea8e185eaf9b (patch)
treefe4c764382857b067dc1022f131ddd38550166c2 /applications/luci-app-statistics
parent478bb37a456e79f3541e0f8fbd672fe39aeb3de6 (diff)
statistics: remove references to Lucid from scripts
Both init.d and uci-defaults scripts included in luci-app-statistics still contained stuff related to lucid, which package was removed by https://github.com/openwrt/luci/commit/91b97bc9f625d09431dc1c753209a037d7c42fbc Changes to scripts: * init.d: lucid reference removed, /var/etc creation moved earlier (before first possible use) * uci-defaults: lucid parameters & restart removed (but busybox httpd stuff was left intact, although it might be unnecessary) Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-statistics')
-rwxr-xr-xapplications/luci-app-statistics/root/etc/init.d/luci_statistics10
-rwxr-xr-xapplications/luci-app-statistics/root/etc/uci-defaults/luci-statistics20
2 files changed, 1 insertions, 29 deletions
diff --git a/applications/luci-app-statistics/root/etc/init.d/luci_statistics b/applications/luci-app-statistics/root/etc/init.d/luci_statistics
index 936f3a63c..ab75b69df 100755
--- a/applications/luci-app-statistics/root/etc/init.d/luci_statistics
+++ b/applications/luci-app-statistics/root/etc/init.d/luci_statistics
@@ -3,23 +3,15 @@ START=79
start() {
### replace shipped config with symlink
+ mkdir -p /var/etc
if [ ! -L /etc/collectd.conf ]; then
test -f /etc/collectd.conf && mv /etc/collectd.conf /etc/collectd.conf.bak
ln -s /var/etc/collectd.conf /etc/collectd.conf
fi
### create config
- mkdir -p /var/etc
/usr/bin/stat-genconfig > /var/etc/collectd.conf
- ### prepare rrdimg directory
- 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
-
### workaround broken permissions on /tmp
chmod 1777 /tmp
}
diff --git a/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics b/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
index e94a8637c..28e35298a 100755
--- a/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
+++ b/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
@@ -8,29 +8,9 @@ uci -q batch <<-EOF >/dev/null
commit ucitrack
EOF
-# register LuCId virtual path handler
-[ -f /etc/config/lucid ] && \
-uci -q batch <<-EOF >/dev/null
- delete lucid.statistics
-
- 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
-
rm -f /tmp/luci-indexcache
exit 0