website-build: serve.sh: remove the need for random temporary directory.
Since we are migrating to haunt and that haunt builds the website in site/ we also use that. In addition that also simplifies the lighttpd configuration. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
This commit is contained in:
parent
14167862d7
commit
c2b4c87fda
|
@ -10,4 +10,5 @@
|
||||||
/Makefile
|
/Makefile
|
||||||
/Makefile.in
|
/Makefile.in
|
||||||
/missing
|
/missing
|
||||||
/website.tar.gz
|
/website.tar.gz
|
||||||
|
/site/**
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
server.bind = "localhost"
|
server.bind = "localhost"
|
||||||
server.port = LIGHTTPD_PORT
|
server.port = LIGHTTPD_PORT
|
||||||
server.document-root = "TMPDIR"
|
server.document-root = var.CWD + "/site/"
|
||||||
dir-listing.activate = "enable"
|
dir-listing.activate = "enable"
|
||||||
index-file.names = ( "index.html" )
|
index-file.names = ( "index.html" )
|
||||||
mimetype.assign = (
|
mimetype.assign = (
|
||||||
|
|
|
@ -37,13 +37,12 @@ if [ $# -eq 2 ] ; then
|
||||||
lighttpd_port="$2"
|
lighttpd_port="$2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tmpdir="$(mktemp -d)"
|
destdir="site/software/gnuboot/"
|
||||||
mkdir -p "${tmpdir}/software/gnuboot/"
|
mkdir -p "${destdir}"
|
||||||
|
|
||||||
tar xf "${tarball}" -C "${tmpdir}/software/gnuboot/"
|
tar xf "${tarball}" -C "${destdir}"
|
||||||
|
|
||||||
sed -e "s#TMPDIR#${tmpdir}#g" \
|
sed -e "s#LIGHTTPD_PORT#${lighttpd_port}#g" \
|
||||||
-e "s#LIGHTTPD_PORT#${lighttpd_port}#g" \
|
|
||||||
"${basedir}/lighttpd.conf.tmpl" > \
|
"${basedir}/lighttpd.conf.tmpl" > \
|
||||||
"${basedir}/lighttpd.conf"
|
"${basedir}/lighttpd.conf"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue