4 files changed, 14 insertions, 10 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 1101cf0..ea70a2e 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,21 +1,23 @@
 pkgbase=supplemental-web
 pkgname=('supplemental-web' 'supplemental-web-slave')
-pkgver=8.2
-pkgrel=6
+pkgver=8.4
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 backup=('data/srv/httpd/cgi/extra.cfg.txt')
-source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh slaveserve.py supplemental_slave.rules supplemental_web.rules )
+source=(supplemental-web.conf supplemental-web.include extra.cfg.txt wakeonlan.sh slaveserve.py supplemental_slave.rules supplemental_web.rules )
 
 package_supplemental-web() {
     pkgdesc="supplemental-web package for master backend"
-    depends=('wol' 'etherwake' 'lighttpd'  'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'shellinabox')
+    depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'shellinabox')
     install=supplemental-web.install
-    replaces='local-website'
-    conflicts='local-website'
+    replaces=('local-website')
+    conflicts=('local-website')
 
     MVDIR=$pkgdir/usr/MythVantage
-    install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf
+    install -m744 -D supplemental-web.conf $pkgdir/etc/gen_light_conf.d/supplemental-web.conf
+    mkdir -p ${pkgdir}/etc/lighttpd
+    install -D -m 644 ${srcdir}/supplemental-web.include ${pkgdir}/etc/lighttpd/
     install -m755 -D wakeonlan.sh $MVDIR/bin/wakeonlan.sh
     #   install -m755 -D backend_control.sh $MVDIR/bin/backend_control.sh
     mkdir -p $pkgdir/data/srv/httpd/htdocs/
@@ -44,7 +46,8 @@ package_supplemental-web-slave() {
     chmod 750 $pkgdir/etc/sudoers.d
 }
 
-md5sums=('a2497205c92ad5b3aa565574afbf7f80'
+md5sums=('250b30ffb725a23c019b84cce2415d57'
+         'a2497205c92ad5b3aa565574afbf7f80'
          '3d8c7b430c1319d706ca420825918d2a'
          '26598fd1dfaf5d36d7b1f9620da5543c'
          'fabf825ca07502db40d78f0aae15f90b'
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index 9e1472d..831a9d5 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -54,7 +54,7 @@ function beStatus()
 
 <li><a href="fe_status_load.shtml">MythFrontend Status</a></li>
 
-<li><a id="modify-me">MythBackend Status</a></li>
+<li><a href="" id="modify-me" target="_blank">MythTV WebFrontend</a></li>
 
 <li><a href="xymon/">Health & Maintenance</a></li>
 
@@ -73,7 +73,7 @@ function beStatus()
 <!--        <li><a onClick=r() >MythBackend Status</a></li> -->
         <li><a href="calllog.shtml">Call Log</a></li>
         <li><a href="mythexport/setup.cgi">MythExport</a></li>
-        <li><a href="mythexpress.html">MythExpress</a></li>
+        <li><a href="mythexpress.html" target="_blank">MythExpress</a></li>
 <!--    <li><a href="remyth.html" >ReMyth</a></li> -->
         <li><a href="zm">ZoneMinder</a></li>
     </ul>
diff --git a/abs/core/supplemental-web/supplemental-web.conf b/abs/core/supplemental-web/supplemental-web.conf
new file mode 100644
index 0000000..bad3a3e
--- /dev/null
+++ b/abs/core/supplemental-web/supplemental-web.conf
@@ -0,0 +1 @@
+include "/etc/lighttpd/supplemental-web.include"
diff --git a/abs/core/supplemental-web/lighttpd-supplement.conf b/abs/core/supplemental-web/supplemental-web.include
index a86cfc6..a86cfc6 100644
--- a/abs/core/supplemental-web/lighttpd-supplement.conf
+++ b/abs/core/supplemental-web/supplemental-web.include