summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core/supplemental-web/PKGBUILD13
-rw-r--r--abs/core/supplemental-web/supplemental-web.conf1
-rw-r--r--abs/core/supplemental-web/supplemental-web.include (renamed from abs/core/supplemental-web/lighttpd-supplement.conf)0
3 files changed, 9 insertions, 5 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 7fafed8..d13da43 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.4
-pkgrel=1
+pkgrel=2
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'
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/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