From 02002703ea2b6a378f2160adfc56b6dc9627991b Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 12 May 2012 17:08:35 -0500 Subject: supplemental-web: clean up header, and during install make it the default webpage --- abs/core/supplemental-web/PKGBUILD | 6 +++--- abs/core/supplemental-web/contents/alt_index.html | 14 ++++++++++++++ abs/core/supplemental-web/contents/docs.html | 4 ---- abs/core/supplemental-web/contents/error/call_log.html | 11 +++++++++++ abs/core/supplemental-web/contents/error/mythexport.html | 11 +++++++++++ abs/core/supplemental-web/contents/header.html | 6 ++++-- abs/core/supplemental-web/contents/index.htm | 14 -------------- abs/core/supplemental-web/contents/links.html | 9 ++++++--- abs/core/supplemental-web/lighttpd-supplement.conf | 7 +++++++ abs/core/supplemental-web/supplemental-web.install | 4 ++-- 10 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 abs/core/supplemental-web/contents/alt_index.html create mode 100644 abs/core/supplemental-web/contents/error/call_log.html create mode 100644 abs/core/supplemental-web/contents/error/mythexport.html delete mode 100644 abs/core/supplemental-web/contents/index.htm diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 40b1f7b..a756347 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,12 +1,12 @@ pkgname=supplemental-web pkgver=1.0 -pkgrel=16 +pkgrel=17 arch=('i686') MVDIR=$startdir/pkg/usr/MythVantage install=supplemental-web.install backup=('extra.cfg.txt') source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh backend_control.sh) -depends=('lighttpd' 'php' 'fcgi' 'python' 'xymonserver' 'certmaster' 'func' 'python_aosd' ) +depends=('lighttpd' 'php' 'fcgi' 'python' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50') @@ -32,7 +32,7 @@ build() { } -md5sums=('2a9d042467220fd1f74f5b12730c2e06' +md5sums=('30aa4235aff78c77d544f930f3d92b62' '3d8c7b430c1319d706ca420825918d2a' '81cdb6ee6804fa36366c6e259a80e7b4' 'f37e10ef9fc84b384b9a2d41f82ef744') diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/alt_index.html new file mode 100644 index 0000000..faf09fb --- /dev/null +++ b/abs/core/supplemental-web/contents/alt_index.html @@ -0,0 +1,14 @@ + + + LinHES: The Linux Home Entertainment System + + + + + + <body> + There is no frame support on your browser. + </body> + + + diff --git a/abs/core/supplemental-web/contents/docs.html b/abs/core/supplemental-web/contents/docs.html index 4a5e64a..21ba2dd 100644 --- a/abs/core/supplemental-web/contents/docs.html +++ b/abs/core/supplemental-web/contents/docs.html @@ -34,16 +34,12 @@ Starting and stopping services. Other Random notes
+
  • MythExport
  • + +
  • Phone call log
  • + diff --git a/abs/core/supplemental-web/contents/index.htm b/abs/core/supplemental-web/contents/index.htm deleted file mode 100644 index faf09fb..0000000 --- a/abs/core/supplemental-web/contents/index.htm +++ /dev/null @@ -1,14 +0,0 @@ - - - LinHES: The Linux Home Entertainment System - - - - - - <body> - There is no frame support on your browser. - </body> - - - diff --git a/abs/core/supplemental-web/contents/links.html b/abs/core/supplemental-web/contents/links.html index a44fefc..cfc7311 100644 --- a/abs/core/supplemental-web/contents/links.html +++ b/abs/core/supplemental-web/contents/links.html @@ -20,9 +20,12 @@ Other Links
  • Phone call log
  • linhes.org Bugtracker
  • -
  • Wiki
  • -
  • Online User Forums
  • -
  • mythtv.com
  • +
  • Wiki
  • +
  • Online User Forums
  • +
  • mythtv.org
  • +
  • mythtv smolt server
  • + + diff --git a/abs/core/supplemental-web/lighttpd-supplement.conf b/abs/core/supplemental-web/lighttpd-supplement.conf index 7b214bb..24e1b4a 100644 --- a/abs/core/supplemental-web/lighttpd-supplement.conf +++ b/abs/core/supplemental-web/lighttpd-supplement.conf @@ -13,6 +13,13 @@ $HTTP["url"] =~ "(xymon)" { server.error-handler-404 = "/error/hobbit.html" } +$HTTP["url"] =~ "(mythexport)" { +server.error-handler-404 = "/error/mythexport.html" +} + +$HTTP["url"] =~ "(call_log)" { +server.error-handler-404 = "/error/call_log.html" +} ## error-handler for status 404 #server.error-handler-404 = "/error-handler.html" server.errorfile-prefix = "/data/srv/httpd/htdocs/error/status-" diff --git a/abs/core/supplemental-web/supplemental-web.install b/abs/core/supplemental-web/supplemental-web.install index 252a8e0..7dc0214 100644 --- a/abs/core/supplemental-web/supplemental-web.install +++ b/abs/core/supplemental-web/supplemental-web.install @@ -20,8 +20,7 @@ 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 @@ -60,6 +59,7 @@ post_remove() { /sbin/sv hup /service/lighttpd + /usr/LH/bin/switch_web.sh local } op=$1 -- cgit v0.12