From 736c95bac183a05ddd845db10bacddb9d070db10 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Apr 2016 17:32:57 +0000 Subject: supplemental-web: move include to own file --- abs/core/supplemental-web/PKGBUILD | 13 +++-- abs/core/supplemental-web/lighttpd-supplement.conf | 67 ---------------------- abs/core/supplemental-web/supplemental-web.conf | 1 + abs/core/supplemental-web/supplemental-web.include | 67 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 72 deletions(-) delete mode 100644 abs/core/supplemental-web/lighttpd-supplement.conf create mode 100644 abs/core/supplemental-web/supplemental-web.conf create mode 100644 abs/core/supplemental-web/supplemental-web.include 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/lighttpd-supplement.conf b/abs/core/supplemental-web/lighttpd-supplement.conf deleted file mode 100644 index a86cfc6..0000000 --- a/abs/core/supplemental-web/lighttpd-supplement.conf +++ /dev/null @@ -1,67 +0,0 @@ -#server.errorlog-use-syslog = "enable" -#$HTTP["url"] !~ "\.(jpe?g|png|gif|css)" { accesslog.use-syslog = "enable" } - -$HTTP["url"] =~ "(mythweb)" { -server.error-handler-404 = "/error/mythweb.html" -} - -$HTTP["url"] =~ "(phpMyAdmin)" { -server.error-handler-404 = "/error/phpadmin.html" -} - -$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" -} - -$HTTP["url"] =~ "(mythexpress)" { - server.error-handler-404 = "/error/mythexpress.html" -} - -$HTTP["url"] =~ "(remyth)" { - server.error-handler-404 = "/error/remyth.html" -} - - -$HTTP["url"] =~ "(zm)" { - server.error-handler-404 = "/error/zoneminder.html" - } - -## error-handler for status 404 -#server.error-handler-404 = "/error-handler.html" -server.errorfile-prefix = "/data/srv/httpd/htdocs/error/status-" - -alias.url += ( "/logs/" => "/var/log/" ) -$HTTP["url"] =~ "^/logs($|/)" { - dir-listing.activate= "enable" - dir-listing.hide-dotfiles = "enable" - dir-listing.external-css = "/frame.css" -} - - - -#cgi.assign = ( ".pl" => "/usr/bin/perl", -# ".sh" => "/bin/bash" , -# ".py" => "/usr/bin/python" , -# ".cgi" => "/bin/bash" ) - - -$SERVER["socket"] == ":1337" { - server.document-root = "/data/srv/httpd/cgi/" - alias.url = ( "/templates/" => "/home/mythtv/templates/" ) - -} - - -#### status module -status.status-url = "/server-status" -status.config-url = "/server-config" - -#ssi.extension = ( ".shtml" ) 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/supplemental-web.include b/abs/core/supplemental-web/supplemental-web.include new file mode 100644 index 0000000..a86cfc6 --- /dev/null +++ b/abs/core/supplemental-web/supplemental-web.include @@ -0,0 +1,67 @@ +#server.errorlog-use-syslog = "enable" +#$HTTP["url"] !~ "\.(jpe?g|png|gif|css)" { accesslog.use-syslog = "enable" } + +$HTTP["url"] =~ "(mythweb)" { +server.error-handler-404 = "/error/mythweb.html" +} + +$HTTP["url"] =~ "(phpMyAdmin)" { +server.error-handler-404 = "/error/phpadmin.html" +} + +$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" +} + +$HTTP["url"] =~ "(mythexpress)" { + server.error-handler-404 = "/error/mythexpress.html" +} + +$HTTP["url"] =~ "(remyth)" { + server.error-handler-404 = "/error/remyth.html" +} + + +$HTTP["url"] =~ "(zm)" { + server.error-handler-404 = "/error/zoneminder.html" + } + +## error-handler for status 404 +#server.error-handler-404 = "/error-handler.html" +server.errorfile-prefix = "/data/srv/httpd/htdocs/error/status-" + +alias.url += ( "/logs/" => "/var/log/" ) +$HTTP["url"] =~ "^/logs($|/)" { + dir-listing.activate= "enable" + dir-listing.hide-dotfiles = "enable" + dir-listing.external-css = "/frame.css" +} + + + +#cgi.assign = ( ".pl" => "/usr/bin/perl", +# ".sh" => "/bin/bash" , +# ".py" => "/usr/bin/python" , +# ".cgi" => "/bin/bash" ) + + +$SERVER["socket"] == ":1337" { + server.document-root = "/data/srv/httpd/cgi/" + alias.url = ( "/templates/" => "/home/mythtv/templates/" ) + +} + + +#### status module +status.status-url = "/server-status" +status.config-url = "/server-config" + +#ssi.extension = ( ".shtml" ) -- cgit v0.12