Merge branch 'testing'

7 files changed, 29 insertions, 23 deletions

diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 3fddaf6..dd73d51 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,16 +1,18 @@
 pkgbase=supplemental-web
 pkgname=('supplemental-web' 'supplemental-web-slave')
 pkgver=8.0
-pkgrel=9
+pkgrel=15
 arch=('i686' 'x86_64')
-
-backup=('extra.cfg.txt')
+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 )
 
 package_supplemental-web() {
     pkgdesc="supplemental-web package for master backend"
-    depends=('wol' 'etherwake' 'lighttpd'  'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50' 'shellinabox')
+    depends=('wol' 'etherwake' 'lighttpd'  'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'shellinabox')
     install=supplemental-web.install
+    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
@@ -30,7 +32,7 @@ package_supplemental-web() {
 package_supplemental-web-slave() {
     pkgdesc="supplemental-web package for slave backend"
     depends=('python2' 'func' 'python_aosd' 'LinHES-system>=2-50')
-    conflicts="supplemental-web"
+    conflicts=("supplemental-web" "local-website")
     mkdir -p $pkgdir/data/srv/httpd/
     cp -rp $startdir/cgi $pkgdir/data/srv/httpd/
     chown -R root:root $pkgdir/data/srv/httpd/
diff --git a/abs/core/supplemental-web/cgi/beclear.cgi b/abs/core/supplemental-web/cgi/beclear.cgi
index 489466d..941c958 100644
--- a/abs/core/supplemental-web/cgi/beclear.cgi
+++ b/abs/core/supplemental-web/cgi/beclear.cgi
@@ -1,4 +1,4 @@
 #!/bin/bash
 /usr/bin/mythbackend --clearcache
-MESSAGE="settings cache is cleared "
+MESSAGE="MythBackend Settings Cache Cleared"
 #/usr/bin/notify.py SYS  "$MESSAGE" 2>/dev/null
diff --git a/abs/core/supplemental-web/cgi/bestart.cgi b/abs/core/supplemental-web/cgi/bestart.cgi
index e09e42b..a7a49b2 100644
--- a/abs/core/supplemental-web/cgi/bestart.cgi
+++ b/abs/core/supplemental-web/cgi/bestart.cgi
@@ -1,10 +1,13 @@
 #!/bin/bash
-# MESSAGE="Trying to start `hostname` B.E."
-# /usr/bin/func "*" call msg display "$MESSAGE" &
+#MESSAGE="Starting `hostname` MythBackend"
+#/usr/bin/func "*" call msg display "$MESSAGE" &
 
-sudo /sbin/sv start mythbackend
-
-MESSAGE="`hostname` B.E. started"
-/usr/bin/func "*" call msg display "$MESSAGE" &
+svresult=`sudo /sbin/sv start mythbackend`
 
+if [[ $svresult == *"run: "* ]]; then
+    MESSAGE="`hostname` MythBackend Started"
+else
+    MESSAGE="`hostname` MythBackend didn't Start\nCheck MythBackend Log"
+fi
 
+/usr/bin/func "*" call msg display "$MESSAGE" &
diff --git a/abs/core/supplemental-web/cgi/bestop.cgi b/abs/core/supplemental-web/cgi/bestop.cgi
index c9d7fad..2d31904 100644
--- a/abs/core/supplemental-web/cgi/bestop.cgi
+++ b/abs/core/supplemental-web/cgi/bestop.cgi
@@ -1,12 +1,13 @@
 #!/bin/bash
-MESSAGE="Trying to stop `hostname` B.E."
-/usr/bin/func "*" call msg display "$MESSAGE" &
-
-sudo /sbin/sv stop mythbackend
-
-MESSAGE="`hostname` B.E. stopped"
+MESSAGE="Stopping `hostname` MythBackend..."
 /usr/bin/func "*" call msg display "$MESSAGE" &
 
+svresult=`sudo /sbin/sv stop mythbackend`
 
+if [[ $svresult == *"down: "* ]]; then
+    MESSAGE="`hostname` MythBackend Stopped"
+else
+    MESSAGE="`hostname` MythBackend didn't Stop"
+fi
 
-
+/usr/bin/func "*" call msg display "$MESSAGE" &
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index d972bfa..032acd1 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -43,9 +43,11 @@ function beStatus()
 

 <li><a id="modify-me">MythBackend Status</a></li>

 

-<li><a href="xymon" >System &#187;</a>

+<li><a href="xymon/">Health & Maintenance</a></li>

+

+<li><a href="/logs/" >System &#187;</a>

     <ul>

-        <li><a href="/xymon"  >Health</a></li>

+    <!--    <li><a href="/xymon"  >Health</a></li>-->

         <li><a href="/logs/"  >Logs</a></li>

         <li><a href="/exports.shtml"  >File Shares</a></li>

         <li><a href="/cardmap.shtml"  >Tuners</a></li>

diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/index.html
index 1168c4a..1168c4a 100644
--- a/abs/core/supplemental-web/contents/alt_index.html
+++ b/abs/core/supplemental-web/contents/index.html
diff --git a/abs/core/supplemental-web/supplemental-web.install b/abs/core/supplemental-web/supplemental-web.install
index 55101ba..6e67c67 100644
--- a/abs/core/supplemental-web/supplemental-web.install
+++ b/abs/core/supplemental-web/supplemental-web.install
@@ -14,7 +14,6 @@ post_install() {
  echo "==> Forcing a re-read of lighttpd's configuration file."
  echo ""
  /sbin/sv hup /service/lighttpd
- /usr/LH/bin/switch_web.sh supplemental
 }
 
 # arg 1:  the new package version
@@ -43,7 +42,6 @@ post_remove() {
  echo "==> Forcing a re-read of lighttpd's configuration file."
  echo ""
  /sbin/sv hup /service/lighttpd
- /usr/LH/bin/switch_web.sh local
 }
 
 op=$1