Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

statistics: remove references to Lucid from scripts

Browse source 
Both init.d and uci-defaults scripts included in luci-app-statistics
still contained stuff related to lucid, which package was removed by
91b97bc9f6

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>
(cherry picked from commit 0d5070c510)
This commit is contained in:
Hannu Nyman 2015-08-30 14:00:29 +03:00
parent 8e156d6e5c
commit d91f0ef027
2 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-app-statistics/root/etc/init.d/luci_statistics
View file

@ -3,23 +3,15 @@ START=79
start() { start() {
### replace shipped config with symlink ### replace shipped config with symlink
mkdir -p /var/etc
if [ ! -L /etc/collectd.conf ]; then if [ ! -L /etc/collectd.conf ]; then
test -f /etc/collectd.conf && mv /etc/collectd.conf /etc/collectd.conf.bak test -f /etc/collectd.conf && mv /etc/collectd.conf /etc/collectd.conf.bak
ln -s /var/etc/collectd.conf /etc/collectd.conf ln -s /var/etc/collectd.conf /etc/collectd.conf
fi fi
### create config ### create config
mkdir -p /var/etc
/usr/bin/stat-genconfig > /var/etc/collectd.conf /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 ### workaround broken permissions on /tmp
chmod 1777 /tmp chmod 1777 /tmp
} }

20
applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
View file

@ -8,29 +8,9 @@ uci -q batch <<-EOF >/dev/null
commit ucitrack commit ucitrack
EOF 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 # symlink for busybox httpd
[ -x /usr/sbin/httpd ] && [ ! -h /www/rrdimg ] && \ [ -x /usr/sbin/httpd ] && [ ! -h /www/rrdimg ] && \
ln -s /tmp/rrdimg /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 rm -f /tmp/luci-indexcache
exit 0 exit 0