2 files changed, 7 insertions, 31 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 50028c5..a032bff 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,22 +1,17 @@
 pkgname=supplemental-web
 pkgver=1.0
-pkgrel=31
+pkgrel=33
 arch=('i686' 'x86_64')
 MVDIR=$startdir/pkg/usr/MythVantage
 install=supplemental-web.install
 backup=('extra.cfg.txt')
-source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh ) 
+source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh )
 depends=('lighttpd'  'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd'  'LinHES-system>=2-50')
 
-
-
-
-
 build() {
         cd $startdir/src
 	mkdir -p $MVDIR/etc
-	install -m755 -D lighttpd-supplement.conf $MVDIR/etc/lighttpd-supplement.conf
-
+	install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf
 	install -m755 -D wakeonlan.sh $MVDIR/bin/wakeonlan.sh
 #	install -m755 -D backend_control.sh $MVDIR/bin/backend_control.sh
 	mkdir -p $startdir/pkg/data/srv/httpd/htdocs/
@@ -28,8 +23,6 @@ build() {
 	cd $startdir/src
 	install -m755 -D extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt
 
-
-
 }
 
 md5sums=('521714803b5a3df529f0fc5f853c0d55'
diff --git a/abs/core/supplemental-web/supplemental-web.install b/abs/core/supplemental-web/supplemental-web.install
index eec33fd..21946b2 100644
--- a/abs/core/supplemental-web/supplemental-web.install
+++ b/abs/core/supplemental-web/supplemental-web.install
@@ -9,14 +9,7 @@ pre_install() {
 # arg 1:  the new package version
 post_install() {
  setfacl -m u:http:rx /home/mythtv/
-
- COUNT=`grep -c "lighttpd-supplement.conf" /etc/lighttpd/conf.include`
- if [ $COUNT == 0 ] 
- then
-    echo "==> Adding lighttpd-suppliement.conf to conf.include"
-    echo "include \"/usr/MythVantage/etc/lighttpd-supplement.conf\""  >>  /etc/lighttpd/conf.include
- fi
- echo 
+ gen_light_include.py
  echo "==> Forcing a re-read of lighttpd's configuration file."
  echo ""
  /sbin/sv hup /service/lighttpd
@@ -44,21 +37,11 @@ pre_remove() {
 
 # arg 1:  the old package version
 post_remove() {
-  /bin/true
- COUNT=`grep -c "lighttpd-supplement.conf" /etc/lighttpd/conf.include`
- if [ $COUNT -gt 0 ]
- then
-      echo "==> Removing  lighttpd-supplement.conf from conf.include"
-      sed -i 's#include \"/usr/MythVantage/etc/lighttpd-supplement.conf\"##' -i  /etc/lighttpd/conf.include
- fi
- 
-
- echo 
+ gen_light_include.py
+ echo
  echo "==> Forcing a re-read of lighttpd's configuration file."
  echo ""
-  /sbin/sv hup /service/lighttpd
-
-
+ /sbin/sv hup /service/lighttpd
  /usr/LH/bin/switch_web.sh local
 }