From 02002703ea2b6a378f2160adfc56b6dc9627991b Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
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 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html>
+ <head><title>LinHES: The Linux Home Entertainment System</title>
+ </head>
+ <frameset rows="217, 80%" frameborder="no" border="3" bordercolor="#000000">
+ <frame src="header.html" name="menuframe" />
+ <frame src="home.shtml" name="content" />
+ <noframes>
+ <body>
+ There is no frame support on your browser.
+ </body>
+ </noframes>
+ </frameset>
+ </html>
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
<br>
<ul id="navlist">
- <li>The root password is blank. You will not be able to remotely access this account until the password is set.</li>
<li>To keep a host from showing up in the network map, add it to:
/data/srv/hobbit/server/ext/ignoreclient.py
</li>
<li>remove "func" from bb-hosts to stop hobbit from running a func check on it </li>
<li>if /tmp/nomfe is present then mythfrontend will not restart </li>
- <li>if /tmp/debug is present then mythfrontend and mythbackend will run with gdb. Debug packages will need to be installed for this to be useful </li>
- <li>create_master.sh will copy the contents of the cdrive to a "Gold" image for network/diskless installation. Dhcp server must be enabled for netboot to work, please turn off any other dhcp servers on your network. </li>
- <li>On the misc screen the nfsmap section will accept entries pointing to different servers. For instance 192.168.1.5:nfsmap will pull the nfsmap file from the ip 192.168.1.5 (hostnames may also be used) </li>
<li>adding pkg names to /etc/pkgname.blacklist will stop MythVantage from autoinstalling a package.</li>
</div>
<br>
diff --git a/abs/core/supplemental-web/contents/error/call_log.html b/abs/core/supplemental-web/contents/error/call_log.html
new file mode 100644
index 0000000..3f05f21
--- /dev/null
+++ b/abs/core/supplemental-web/contents/error/call_log.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<style type="text/css">@import "/frame.css";</style>
+</head>
+
+<body>
+Call logging is not enabled, or no calls logs
+</br>
+To enable logging of incoming phone calls please visit the advanced section of the service menu
+</body>
+</html>
diff --git a/abs/core/supplemental-web/contents/error/mythexport.html b/abs/core/supplemental-web/contents/error/mythexport.html
new file mode 100644
index 0000000..88966c6
--- /dev/null
+++ b/abs/core/supplemental-web/contents/error/mythexport.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<style type="text/css">@import "/frame.css";</style>
+</head>
+
+<body>
+MythExport does not appear to be installed.
+</br>
+
+</body>
+</html>
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index e476799..1e69c1c 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -27,8 +27,10 @@ function r()
<!-- <li><a href="webcal/" >Calendar</a></li> -->
<li><a onClick=r() >Myth Backend Status</a></li>
<li><a href="mythweb/" >MythWeb</a></li>
- <li><a href="phpMyAdmin/" >phpMyAdmin</a></li>
- </ul>
+ <li><a href="mythexport/setup.cgi" >MythExport</a></li>
+
+ <li><a href="/calllog.shtml" >Phone call log</a> </li>
+</ul>
</div>
</body>
</html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html>
- <head><title>LinHES: The Linux Home Entertainment System</title>
- </head>
- <frameset rows="217, 80%" frameborder="no" border="3" bordercolor="#000000">
- <frame src="header.html" name="menuframe" />
- <frame src="home.shtml" name="content" />
- <noframes>
- <body>
- There is no frame support on your browser.
- </body>
- </noframes>
- </frameset>
- </html>
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
<li><a href="/calllog.shtml" >Phone call log</a> </li>
<!-- <li><a href="/mvpmc.shtml" >Media MVP setup</a> (dhcp server must be enabled) </li> -->
<li><a href="http://www.linhes.org" >linhes.org </a>Bugtracker</li>
- <li><a href="http://linhes.org/bugs/projects/linhes/wiki" >Wiki </a></li>
- <li><a href="http://mysettopbox.tv/phpBB2/" >Online User Forums</a></li>
- <li><a href="http://www.mythtv.com" >mythtv.com</a></li>
+ <li><a href="http://linhes.org/wiki" >Wiki </a></li>
+ <li><a href="http://forums.linhes.org" >Online User Forums</a></li>
+ <li><a href="http://www.mythtv.org" >mythtv.org</a></li>
+ <li><a href="http://smolt.mythtv.org" >mythtv smolt server</a></li>
+
+
</ul>
</div>
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