15 files changed, 2 insertions, 1128 deletions
diff --git a/Makefile b/Makefile
index d79c79aac..f867c6b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = frontend/cli/* frontend/cgi/live-build-cgi frontend/cgi/live-build-cgi.cron functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
+SCRIPTS = frontend/cli/* functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*
 
 all: build
 
@@ -40,7 +40,7 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live/build
-	cp -r frontend/cgi data functions templates VERSION $(DESTDIR)/usr/share/live/build
+	cp -r data functions templates VERSION $(DESTDIR)/usr/share/live/build
 	cp -r share/* $(DESTDIR)/usr/share/live/build
 
 	# Installing executables
diff --git a/debian/rules b/debian/rules
index 54f162b7d..9a8e28404 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,6 @@ override_dh_auto_install:
 	# Removing unused files
 	rm -f debian/live-build/usr/share/doc/live-build/COPYING
 
-	# live-build-cgi
-	mkdir -p debian/live-build-cgi/usr/share/live/build
-	mv debian/live-build/usr/share/live/build/cgi debian/live-build-cgi/usr/share/live/build
-
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
diff --git a/frontend/cgi/Makefile b/frontend/cgi/Makefile
deleted file mode 100644
index b4eab43d8..000000000
--- a/frontend/cgi/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile
-
-install:
-	install -D -m 0755 live-build-cgi $(DESTDIR)/usr/lib/cgi-bin/live-build
-	install -D -m 0755 live-build-status-cgi $(DESTDIR)/usr/lib/cgi-bin/live-build-status
-	install -D -m 0755 live-build-cgi.cron $(DESTDIR)/etc/cron.hourly/live-build-cgi
-	install -D -m 0644 live-build-cgi.crontab $(DESTDIR)/etc/cron.d/live-build-cgi
-	install -D -m 0644 live-build-cgi.default $(DESTDIR)/etc/default/live-build-cgi
-	install -D -m 0644 live-build-cgi.logrotate $(DESTDIR)/etc/logrotate.d/live-build-cgi
-
-	install -d -m 0755 $(DESTDIR)/var/log
-	touch $(DESTDIR)/var/log/live
-	chown www-data:www-data $(DESTDIR)/var/log/live
-
-uninstall:
-	rm -f $(DESTDIR)/usr/lib/cgi-bin/live-build
-	rm -f $(DESTDIR)/usr/lib/cgi-bin/live-build-status
-	rm -f $(DESTDIR)/etc/cron.d/live-build-cgi
-	rm -f $(DESTDIR)/etc/cron.hourly/live-build-cgi
-	rm -f $(DESTDIR)/etc/default/live-build-cgi
-	rm -f $(DESTDIR)/etc/logrotate.d/live-build-cgi
-
-reinstall: uninstall install
diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi
deleted file mode 100755
index f812f0d6a..000000000
--- a/frontend/cgi/live-build-cgi
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-# Including common functions
-. /usr/lib/live/build.sh
-
-# Reading defaults
-if [ -r /etc/default/live-build-cgi ]
-then
-	. /etc/default/live-build-cgi
-else
-	echo "E: /etc/default/live-build-cgi missing"
-	exit 1
-fi
-
-_HOSTNAME="$(hostname -f)"
-
-# Turn on debug if true
-if [ "${_DEBUG}" = "true" ]
-then
-	set -x
-fi
-
-# Sending http header
-echo "Content-type: text/html"
-echo
-
-# If we are passed something then read it in.
-if [ "$REQUEST_METHOD" = "POST" ] && [ "$CONTENT_LENGTH" -gt 0 ]
-then
-	#QUERY_STRING=`cat /dev/stdin`
-	QUERY_STRING=$(cat /dev/stdin)
-	#read -n $CONTENT_LENGTH POST_DATA <&0
-fi
-
-# Translate parameters
-QUERY_STRING=$(echo "${POST_DATA}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
-# Debug the filtering string
-# echo ${QUERY_STRING}
-
-
-# Sending html header
-cat "${_TEMPLATES}"/header.html
-
-# CGI
-if [ -z "${QUERY_STRING}" ]
-then
-	# Sending html form
-	sed -e "s/VERSION/${VERSION}/" \
-	    -e "s/DATE/`date +%Y%m%d-%H:%M`/" \
-	"${_TEMPLATES}"/form.html
-else
-	# Converting spaces:	sed 's/+/ /g'
-	# Converting '@':	sed 's/%40/@/g'
-	# Converting ':':	sed 's/%3A/:/g'
-	# Converting ';':	sed 's/%3B/\;/g'
-	# Converting '/':	sed 's/%2F/\//g'
-	# Converting '~':	sed 's/%7E/\~/g'
-	# Converting '=':	sed 's/%3D/=/g'
-	# Converting '+':	sed 's/%2B/+/g'
-
-	# Email
-	_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
-
-	# CGI Packages List
-	_LB_CGIPACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])cgipackages=[-0-9a-zA-Z. _+]+' | cut -f 2 -d '=' | head -n1)
-
-	# CGI Config for git
-	_LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z]+' | cut -f 2 -d '=' | head -n1)
-
-	# Standard options
-	LB_BINARY_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1)
-
-	# Advanced bootstrap options
-	LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
-
-	# Advanced chroot options
-	LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_LINUX_FLAVOURS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])linux_flavours=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1)
-
-	# Advanced binary options
-	LB_APT_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
-	LB_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
-	LB_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
-	LB_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
-	LB_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1)
-	LB_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
-	LB_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
-	LB_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
-	LB_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
-
-	# Advanced source options
-	LB_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
-
-	# FIXME: filter invalid options
-	unset QUERY_STRING
-
-	if [ -z "${_EMAIL}" ]
-	then
-		echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>"
-
-		sed -e "s/VERSION/${VERSION}/" \
-		    -e "s/DATE/`date +%Y%m%d-%H:%M`/" \
-		"${_TEMPLATES}"/form.html
-
-		exit
-	fi
-
-	# Getting build identifier
-	_BUILD=$(date +%Y%m%d.%H%M%S.%N)
-
-	# Getting number of builds pending.
-	_QUEUENUM=$(ls "${_TEMPDIR}"/*.build | wc -l)
-
-	#echo "${QUERY_STRING}"
-	# Sending html confirmation
-	# Note: On each string remember to use a delimeter that is not in the string.
-	sed -e "s/BUILD/${_BUILD}/g" \
-	    -e "s/EMAIL/${_EMAIL}/" \
-	    -e "s/QUEUENUM/${_QUEUENUM}/" \
-	    -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \
-	    -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
-	    -e "s#_LB_CONFIG#${_LB_CONFIG}#" \
-	    -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \
-	    -e "s/LB_APT/${LB_APT}/" \
-	    -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-	    -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \
-	    -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
-	    -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
-	    -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
-	    -e "s/LB_SECURITY/${LB_SECURITY}/" \
-	    -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
-	    -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
-	    -e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \
-	    -e "s/LB_DEBIAN_INSTALLER/${LB_DEBIAN_INSTALLER}/" \
-	    -e "s#LB_ISO_APPLICATION#${LB_ISO_APPLICATION}#" \
-	    -e "s#LB_ISO_PREPARER#${LB_ISO_PREPARER}#" \
-	    -e "s#LB_ISO_PUBLISHER#${LB_ISO_PUBLISHER}#" \
-	    -e "s#LB_ISO_VOLUME#${LB_ISO_VOLUME}#" \
-	    -e "s/LB_MEMTEST/${LB_MEMTEST}/" \
-	    -e "s#LB_NET_ROOT_PATH#${LB_NET_ROOT_PATH}#" \
-	    -e "s/LB_NET_ROOT_SERVER/${LB_NET_ROOT_SERVER}/" \
-	    -e "s#SERVER#${_SERVER}#g" \
-	    -e "s/LB_SOURCE_IMAGES/${LB_SOURCE_IMAGES}/" \
-	    -e "s/LB_SOURCE/${LB_SOURCE}/" \
-	"${_TEMPLATES}"/build.html
-
-	# Creating temporary directory
-	mkdir -p "${_TEMPDIR}"
-
-# Writing build file
-cat > "${_TEMPDIR}"/"${_BUILD}".build << EOF
-# live-build-cgi "${VERSION}" build file
-# `date -R`
-
-_BUILD="${_BUILD}"
-_EMAIL="${_EMAIL}"
-
-REMOTE_ADDR="${REMOTE_ADDR}"
-
-# CGI Packages List
-_LB_CGIPACKAGES="${_LB_CGIPACKAGES}"
-
-# CGI Config for git
-_LB_CONFIG="${_LB_CONFIG}"
-
-# Standard options
-LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
-LB_DISTRIBUTION="${LB_DISTRIBUTION}"
-LB_APT="${LB_APT}"
-
-# Advanced bootstrap options
-LB_ARCHITECTURES="${LB_ARCHITECTURES}"
-LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
-
-# Advanced chroot options
-LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
-LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}"
-LB_SECURITY="${LB_SECURITY}"
-
-# Advanced binary options
-LB_APT_INDICES="${LB_APT_INDICES}"
-LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
-LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
-LB_BOOTLOADER="${LB_BOOTLOADER}"
-LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER}"
-LB_ISO_APPLICATION="${LB_ISO_APPLICATION}"
-LB_ISO_PREPARER="${LB_ISO_PREPARER}"
-LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}"
-LB_ISO_VOLUME="${LB_ISO_VOLUME}"
-LB_MEMTEST="${LB_MEMTEST}"
-LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}"
-LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}"
-
-# Advanced source options
-LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
-LB_SOURCE="${LB_SOURCE}"
-
-EOF
-
-	echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-request
-	echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request
-fi
-
-sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
diff --git a/frontend/cgi/live-build-cgi.cron b/frontend/cgi/live-build-cgi.cron
deleted file mode 100755
index 3a6d985e9..000000000
--- a/frontend/cgi/live-build-cgi.cron
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-# Including common functions
-. /usr/lib/live/build.sh
-
-# Reading defaults
-if [ -r /etc/default/live-build-cgi ]
-then
-	. /etc/default/live-build-cgi
-else
-	echo "E: /etc/default/live-build-cgi missing"
-	exit 1
-fi
-
-# Exit if disabled
-if [ "${_WEBBUILD}" != "true" ]
-then
-	exit 0
-fi
-
-_HOSTNAME="$(hostname -f)"
-
-# Turn on debug if true
-if [ "${_DEBUG}" = "true" ]
-then
-	set -x
-fi
-
-# Locknum sets the lock enumeration for multiple instances of l-b-cgi
-_LOCKNUM="$(expr 1 + $(expr $(date +%M) % ${_INSTANCES}))"
-
-# Checking lock file
-if [ -f /var/lock/live-build-cgi-${_LOCKNUM}.lock ]
-then
-	echo "E: live-build-cgi instance ${_LOCKNUM} already/still running."
-	exit 1
-fi
-
-# Creating lock trap
-trap "test -f /var/lock/live-build-cgi-${_LOCKNUM}.lock && rm -f /var/lock/live-build-cgi-${_LOCKNUM}.lock; exit 0" 0 1 2 3 9 15
-
-# Creating lock file
-touch /var/lock/live-build-cgi-${_LOCKNUM}.lock
-
-# Cleanup old builds: cron should be run at least once per hour to take effect
-if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1
-then
-	rm -rf "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
-
-	echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live/live-build
-fi
-
-# Ok from here spin through the live-build-cgi files we have waiting to build
-#if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1
-if Find_files ${_TEMPDIR}/*.build
-then
-	_FILE=$(ls "${_TEMPDIR}"/*.build | sort | head -1)
-	# Pull in variables from the build file.
-	. "${_FILE}"
-
-	# Drop out some build data for information if something goes wrong.
-	echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live/live-build
-
-	# Clone the git config to target build directory
-	git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live/live-build
-	_ERRORGIT="${?}"
-
-	# Moving build file to the tempdir and remove from submission area.
-	mv "${_TEMPDIR}"/"${_BUILD}".build "${_TEMPDIR}"/"${_BUILD}"/
-
-	# Sanity check to default to something since we are going to build from git clone.
-	if [ -z "${_LB_CONFIG}" ]
-	then
-		_LB_CONFIG="standard"
-	fi
-
-	# Now set a variable for the correct build path
-	_BUILD_PATH="${_TEMPDIR}/${_BUILD}/images/${_LB_CONFIG}"
-
-	_DATE_START="`date -R`"
-	echo "Begin live-build-cgi: ${_DATE_START}" > "${_BUILD_PATH}"/log
-	echo "Info live-build-cgi: Config tree cloned from ${_LB_GIT} for build ${_BUILD}" >> "${_BUILD_PATH}"/log
-
-	# Creating directory for the config/package-lists
-	mkdir -p "${_BUILD_PATH}"/config/package-lists
-
-	# Add cgipackages.list.chroot
-	if [ -n "${_LB_CGIPACKAGES}" ]
-	then
-		echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot
-	fi
-
-	# Generating config here
-	if [ "${_ERRORGIT}" -eq "0" ]
-	then
-		cd "${_BUILD_PATH}"
-		# Do config with git and stack on config file params to build
-		lb config ${_CGI_CONFIG_APPEND} --apt "${LB_APT}" --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
-		_ERRORCONFIG="${?}"
-	else
-		echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log
-	fi
-
-	# Run build if config went ok
-	if [ "${_ERRORCONFIG}" -eq "0" ]
-	then
-		# We need to finish script.
-		set +e
-		lb build noauto >> "${_BUILD_PATH}"/log 2>&1
-		_ERRORBUILD="${?}"
-	else
-		echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" >> "${_BUILD_PATH}"/log
-	fi
-
-	_DATE_END="`date -R`"
-	echo "End: ${_DATE_END}" >> "${_BUILD_PATH}"/log
-
-	# Creating image directory
-	mkdir -p "${_DESTDIR}"/"${_BUILD}"
-
-	# Creating mail and logging.
-	if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
-	then
-		_STATUS="maybe-successful"
-		echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live/live-build-cgi-status
-	else
-		_STATUS="maybe-failed"
-		echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live/live-build-cgi-status
-	fi
-
-	sed -e "s/BUILD/${_BUILD}/g" \
-	    -e "s/EMAIL/${_EMAIL}/" \
-	    -e "s/VERSION/${VERSION}/" \
-	    -e "s/DATE_START/${_DATE_START}/" \
-	    -e "s/DATE_END/${_DATE_END}/" \
-	    -e "s/STATUS/${_STATUS}/" \
-	    -e "s#SERVER#${_SERVER}#" \
-	"${_TEMPLATES}"/mail.txt > "${_DESTDIR}"/"${_BUILD}"/mail
-
-cat >> "${_DESTDIR}"/"${_BUILD}"/mail << EOF
-
----
-
-Here's a list of all build-options that were used to build your image:
-
-EOF
-
-	cat "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build >> "${_DESTDIR}"/"${_BUILD}"/mail
-
-	# Moving live-image-* files
-	if Find_files ${_BUILD_PATH}/live-image-*
-	then
-		mv "${_BUILD_PATH}"/live-image-* "${_DESTDIR}"/"${_BUILD}"
-	fi
-
-	# Moving build
-	mv "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build "${_DESTDIR}"/"${_BUILD}"/build
-
-	# Moving log
-	mv "${_BUILD_PATH}"/log "${_DESTDIR}"/"${_BUILD}"
-
-	# Generating md5sum
-	cd "${_DESTDIR}"/"${_BUILD}"
-	md5sum * > md5sum
-	cd "${OLDPWD}"
-
-	# Sending mail
-	cat "${_DESTDIR}"/"${_BUILD}"/mail | /usr/sbin/sendmail -t
-
-	# Unmounting devpts-live
-	#if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1
-	if Find_files ${_BUILD_PATH}/chroot/dev/pts/*
-	then
-		umount "${_BUILD_PATH}"/chroot/dev/pts
-	fi
-
-	# Unmounting proc
-	if [ -f "${_BUILD_PATH}"/chroot/proc/version ]
-	then
-		umount "${_BUILD_PATH}"/chroot/proc
-	fi
-
-	# Unmounting sysfs
-	if [ -d "${_BUILD_PATH}"/chroot/sys/kernel ]
-	then
-		umount "${_BUILD_PATH}"/chroot/sys
-	fi
-
-	# Removing build directory
-	rm -rf "${_TEMPDIR}"/"${_BUILD}"
-
-	echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live/live-build
-fi
diff --git a/frontend/cgi/live-build-cgi.crontab b/frontend/cgi/live-build-cgi.crontab
deleted file mode 100644
index 1bf7a815d..000000000
--- a/frontend/cgi/live-build-cgi.crontab
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/crontab - system-wide crontab
-
-SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-# m  h dom mon dow user command
-*/1  * *   *   *   root /etc/cron.hourly/live-build-cgi > /dev/null 2>&1
diff --git a/frontend/cgi/live-build-cgi.default b/frontend/cgi/live-build-cgi.default
deleted file mode 100644
index c7e26bc5f..000000000
--- a/frontend/cgi/live-build-cgi.default
+++ /dev/null
@@ -1,19 +0,0 @@
-# Defaults for /etc/cron.daily/live-build-cgi
-
-_WEBBUILD="false"
-
-_MODE="debian"
-
-_DEBUG="false"
-
-_INSTANCES="1"
-
-_DESTDIR="/srv/debian-live/build/www"
-_TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}"
-_TEMPDIR="/srv/debian-live/build/tmp"
-
-_SERVER="http://live-systems.org/build"
-
-_LB_GIT="git://live-systems.org/git/live-images.git"
-
-_CGI_CONFIG_APPEND=""
diff --git a/frontend/cgi/live-build-cgi.logrotate b/frontend/cgi/live-build-cgi.logrotate
deleted file mode 100644
index 75d89a9eb..000000000
--- a/frontend/cgi/live-build-cgi.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/logrotate.d/live-build
-
-/var/log/live
-{
-	compress
-	copytruncate
-	missingok
-	monthly
-	notifempty
-	rotate 24
-}
diff --git a/frontend/cgi/live-build-status-cgi b/frontend/cgi/live-build-status-cgi
deleted file mode 100755
index 560eb4f40..000000000
--- a/frontend/cgi/live-build-status-cgi
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2015 Daniel Baumann <mail@daniel-baumann.ch>
-## Copyright (C) 2015 Richard Nelson <unixabg@gmail.com>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-# Including common functions
-. /usr/lib/live/build.sh
-
-# Reading defaults
-if [ -r /etc/default/live-build-cgi ]
-then
-	. /etc/default/live-build-cgi
-else
-	echo "E: /etc/default/live-build-cgi missing"
-	exit 1
-fi
-
-_HOSTNAME="$(hostname -f)"
-
-# Turn on debug if true
-if [ "${_DEBUG}" = "true" ]
-then
-	set -x
-fi
-
-# Sending http header
-echo "Content-type: text/html"
-echo
-
-# Sending html header
-cat "${_TEMPLATES}"/header.html
-
-# CGI
-if [ -z "${QUERY_STRING}" ]
-then
-	# Sending html form
-	echo "<h2><div style='color: red;'>Error: No cgi build specified.</div></h2>"
-else
-	# Converting spaces:	sed 's/+/ /g'
-	# Converting '@':	sed 's/%40/@/g'
-	# Converting ':':	sed 's/%3A/:/g'
-	# Converting ';':	sed 's/%3B/\;/g'
-	# Converting '/':	sed 's/%2F/\//g'
-	# Converting '~':	sed 's/%7E/\~/g'
-	# Converting '=':	sed 's/%3D/=/g'
-	# Converting '+':	sed 's/%2B/+/g'
-
-	# Standard options
-	_CGI_BUILD=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])cgi_build=[0-9.]+' | cut -f 2 -d '=' | head -n1)
-
-	#echo ${_CGI_BUILD}
-	#echo ${QUERY_STRING}
-
-	# FIXME: filter invalid options
-	unset QUERY_STRING
-
-	if [ -z "${_CGI_BUILD}" ]
-	then
-		echo "<h2><div style='color: red;'>Error: No cgi build specified.</div></h2>"
-		sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
-		_CGI_BUILD="BAD"
-	fi
-
-	# Getting number of builds pending.
-	_QUEUENUM=$(ls "${_TEMPDIR}"/*.build | wc -l)
-
-	# Getting number of builds processing.
-	_PNUM=$(ls -d "${_TEMPDIR}"/*/ | wc -l)
-
-	# Find the build if exists and populate status html else respond no build.
-	#echo "${QUERY_STRING}"
-	if [ -f "${_TEMPDIR}"/"${_CGI_BUILD}".build ]
-	then
-		# If build file exists in the tempdir folder then the build is pending.
-		_STATUS="PENDING"
-		. "${_TEMPDIR}"/"${_CGI_BUILD}".build
-
-	elif [ -f "${_TEMPDIR}"/"${_CGI_BUILD}"/"${_CGI_BUILD}".build ]
-	then
-		# If build file exists the tempdir/build folder the build is running.
-		_STATUS="RUNNING"
-		. "${_TEMPDIR}"/"${_CGI_BUILD}"/"${_CGI_BUILD}".build
-
-	elif [ -f "${_DESTDIR}"/"${_CGI_BUILD}"/build ]
-	then
-		# If build file exists the tempdir/build folder the build is running.
-		_STATUS="COMPLETED"
-		. "${_DESTDIR}"/"${_CGI_BUILD}"/build
-
-	else
-		_STATUS="Bad or malformed"
-	fi
-
-	# Test whether to send out information
-	if [ "${_STATUS}" != "Bad or malformed" ]
-	then
-		# Send out the html
-		# Note: On each string remember to use a delimeter that is not in the string.
-		sed -e "s/BUILD/${_CGI_BUILD}/g" \
-		    -e "s/EMAIL/${_EMAIL}/" \
-		    -e "s/STATUS/${_STATUS}/" \
-		    -e "s/QUEUENUM/${_QUEUENUM}/" \
-		    -e "s/PNUM/${_PNUM}/" \
-		    -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \
-		    -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
-		    -e "s#_LB_CONFIG#${_LB_CONFIG}#" \
-		    -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \
-		    -e "s/LB_APT/${LB_APT}/" \
-		    -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-		    -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \
-		    -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
-		    -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
-		    -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
-		    -e "s/LB_SECURITY/${LB_SECURITY}/" \
-		    -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
-		    -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
-		    -e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \
-		    -e "s/LB_DEBIAN_INSTALLER/${LB_DEBIAN_INSTALLER}/" \
-		    -e "s#LB_ISO_APPLICATION#${LB_ISO_APPLICATION}#" \
-		    -e "s#LB_ISO_PREPARER#${LB_ISO_PREPARER}#" \
-		    -e "s#LB_ISO_PUBLISHER#${LB_ISO_PUBLISHER}#" \
-		    -e "s#LB_ISO_VOLUME#${LB_ISO_VOLUME}#" \
-		    -e "s/LB_MEMTEST/${LB_MEMTEST}/" \
-		    -e "s#LB_NET_ROOT_PATH#${LB_NET_ROOT_PATH}#" \
-		    -e "s/LB_NET_ROOT_SERVER/${LB_NET_ROOT_SERVER}/" \
-		    -e "s#SERVER#${_SERVER}#g" \
-		    -e "s/LB_SOURCE_IMAGES/${LB_SOURCE_IMAGES}/" \
-		    -e "s/LB_SOURCE/${LB_SOURCE}/" \
-		"${_TEMPLATES}"/status.html
-
-	else
-		echo "Your request of ${_CGI_BUILD}, resulted in a malformed request or build number not found. All requests are logged."
-	fi
-	echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-status: ${_STATUS} build status requested for (${_CGI_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-status
-fi
-sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
diff --git a/templates/cgi/debian/build.html b/templates/cgi/debian/build.html
deleted file mode 100644
index 0a95615b7..000000000
--- a/templates/cgi/debian/build.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<br />
-
-<h3>Your build 'BUILD' was recorded and will be processed soon. Depending on the options you have selected, a build attempt generally takes between 5 and 60 minutes to complete. Currently there are 'QUEUENUM' pending build(s) to be processed ahead of your request. You will be notified by email when the attempt has completed.</h3>
-
-<h3>Your build build status is available at: <a href="SERVER/../cgi-bin/live-build-status?cgi_build=BUILD">SERVER/../cgi-bin/live-build-status?cgi_build=BUILD</a>.</h3>
-
-<h3>Your build upon completion will be available at: <a href="SERVER/BUILD/">SERVER/BUILD/</a>.</h3>
-
-<fieldset>
-
-<legend><b>Options</b></legend>
-
-<b>Standard options</b>
-
-<table>
-	<tr><td>Email: </td><td>EMAIL</td></tr>
-	<tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
-	<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
-	<tr><td>--config: </td><td>_LB_CONFIG</td></tr>
-	<tr><td>--apt: </td><td>LB_APT</td></tr>
-	<tr><td>cgipackages.list.chroot: </td><td>_LB_CGIPACKAGES</td><tr>
-</table>
-
-<b>Advanced bootstrap options</b>
-
-<table>
-	<tr><td>--architectures: </td><td>LB_ARCHITECTURES</td></tr>
-	<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
-</table>
-
-<b>Advanced chroot options</b>
-
-<table>
-	<tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
-	<tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
-	<tr><td>--security: </td><td>LB_SECURITY</td></tr>
-</table>
-
-<b>Advanced binary options</b>
-
-<table>
-	<tr><td>--apt-indices: </td><td>LB_APT_INDICES</td></tr>
-	<tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
-	<tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
-	<tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
-	<tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
-	<tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
-	<tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
-	<tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
-	<tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
-	<tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
-</table>
-
-<b>Advanced source options</b>
-
-<table>
-	<tr><td>--source: </td><td>LB_SOURCE</td></tr>
-	<tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
-</table>
-
-</fieldset>
-
-<br />
-
-<h3>Thank you for your submission.</h3>
diff --git a/templates/cgi/debian/footer.html b/templates/cgi/debian/footer.html
deleted file mode 100644
index 517fc5949..000000000
--- a/templates/cgi/debian/footer.html
+++ /dev/null
@@ -1,16 +0,0 @@
-      <hr />
-
-      <footer>
-        <p><div class="muted">2006-2015 <a class="muted" href="mailto:debian-live@lists.debian.org?subject=Live Systems Project:%20Feedback">Live Systems Project</a> live-build VERSION <a class="muted pull-right" href="http://live-systems.org/project/legal/">Legal Information</a></p>
-      </footer>
-    </div> <!-- /container -->
-
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="http://live-systems.org/stuff/jquery/jquery.min.js"></script>
-    <script src="http://live-systems.org/stuff/bootstrap/js/bootstrap.min.js"></script>
-    <script src="http://live-systems.org/stuff/bootstrap/table.js"></script>
-  </body>
-</html>
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
deleted file mode 100644
index 59e4a6d9d..000000000
--- a/templates/cgi/debian/form.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own live system.</h3>
-
-<form action="live-build" method="post">
-
-<fieldset>
-
-<legend><b>Options</b></legend>
-
-<table>
-	<tr>
-		<td><label for="Email">Email Address:</label> </td>
-		<td><input id="Email" name="email" maxlength="50" size="50" type="text" /></td>
-	</tr>
-</table>
-
-<span id="click_1" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(1,"<b>Standard options</b>")'>
-	<b>Standard options</b><small>&nbsp;(click to collapse)</small>
-	<br />
-</span>
-
-<div id="text_1" style='margin-left:0;display:block'>
-	<table>
-		<tr>
-			<td><label for="Binary_Images">--binary-images:</label> </td>
-			<td>
-				<select id="Binary_Images" name="binary_images" size="1">
-					<option value="iso">iso</option>
-					<option selected value="iso-hybrid">iso-hybrid</option>
-					<option value="netboot">netboot</option>
-					<option value="tar">tar</option>
-					<option value="hdd">hdd</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Distribution">--distribution:</label> </td>
-			<td>
-				<select id="Distribution" name="distribution" size="1">
-					<option selected value="jessie">jessie</option>
-					<option value="stretch">stretch</option>
-					<option value="sid">sid</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Config">--config:</label> </td>
-			<td>
-				<select id="Config" name="config" size="1" >
-					<option value="cinnamon-desktop">Cinnamon Desktop</option>
-					<option value="gnome-desktop">GNOME Desktop</option>
-					<option value="kde-desktop">KDE Desktop</option>
-					<option value="lxde-desktop">LXDE Desktop</option>
-					<option value="mate-desktop">Mate Desktop</option>
-					<option selected value="standard">Standard</option>
-					<option value="xfce-desktop">Xfce Desktop</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Apt">--apt:</label> </td>
-			<td>
-				<select id="Apt" name="apt" size="1" >
-					<option selected value="apt">apt</option>
-					<option value="aptitude">aptitude</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Packages">cgipackages.list.chroot:</label> </td>
-			<td><input id="Packages" name="cgipackages" maxlength="2000" size="50" type="text" /></td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_2" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(2,"<b>Advanced bootstrap options</b>")'>
-	<b>Advanced bootstrap options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_2" style='margin-left:0;display:none'>
-	<table>
-		<tr>
-			<td><label for="Architectures">--architectures:</label> </td>
-			<td>
-				<select id="Architectures" name="architectures" size="1">
-					<option value="amd64">amd64</option>
-					<option selected value="i386">i386</option>
-				</select>
-			</td>
-		</tr>
-		<!-- LIVE_DISTRIBUTION -->
-		<!-- LIVE_DISTRIBUTION_CONFIG -->
-		<tr>
-			<td><label for="Archive_Areas">--archive-areas:</label> </td>
-			<td><input id="Archive_Areas" name="archive_areas" maxlength="128" size="50" type="text" value="main" readonly /></td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_3" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(3,"<b>Advanced chroot options</b>")'>
-	<b>Advanced chroot options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_3" style='margin-left:0;display:none'>
-	<table>
-		<tr>
-			<td><label for="Chroot_Filesystem">--chroot-filesystem:</label> </td>
-			<td>
-				<select id="Chroot_Filesystem" name="chroot_filesystem" size="1">
-					<option value="ext2">ext2</option>
-					<option value="plain">plain</option>
-					<option selected value="squashfs">squashfs</option>
-				</select>
-			</td>
-		</tr>
-		<!-- LIVE_HOOKS -->
-		<!-- LIVE_INTERACTIVE -->
-		<!-- LIVE_KEYRING_PACKAGES -->
-		<!-- LIVE_LANGUAGE -->
-		<tr>
-			<td><label for="Linux_Flavours">--linux-flavours:</label> </td>
-			<td>
-				<select id="Linux_Flavours" name="linux_flavours" size="1">
-					<option selected value="486">486</option>
-					<option value="686">686</option>
-					<option value="686-pae">686-pae</option>
-					<option value="amd64">amd64</option>
-					<option value="k7">k7</option>
-					<option value="vserver-686">vserver-686</option>
-					<option value="vserver-k7">vserver-k7</option>
-					<option value="xen-686">xen-686</option>
-				</select>
-			</td>
-		</tr>
-		<!-- LIVE_LINUX_PACKAGES -->
-		<tr>
-			<td><label for="Security">--security:</label> </td>
-			<td>
-				<select id="Security" name="security" size="1">
-					<option selected value="true">true</option>
-					<option value="false">false</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_4" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(4,"<b>Advanced binary options</b>")'>
-	<b>Advanced binary options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_4" style='margin-left:0;display:none'>
-	<table>
-		<!-- LIVE_BINARY_IMAGES -->
-		<tr>
-			<td><label for="Apt_Indices">--apt-indices:</label> </td>
-			<td>
-				<select id="Apt_Indices" name="apt_indices" size="1">
-					<option selected value="true">true</option>
-					<option value="false">false</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Bootappend_Live">--bootappend-live:</label> </td>
-			<td><input id="Bootappend_Live" name="bootappend_live" maxlength="256" size="50" type="text" value="" /></td>
-		</tr>
-		<tr>
-			<td><label for="Bootloader">--bootloader:</label> </td>
-			<td>
-				<select id="Bootloader" name="bootloader" size="1">
-					<option value="grub">grub</option>
-					<option value="grub2">grub2</option>
-					<option selected value="syslinux">syslinux</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Debian_Installer">--debian-installer:</label> </td>
-			<td>
-				<select id="Debian_Installer" name="debian_installer" size="1">
-					<option value="true">true</option>
-					<option selected value="false">false</option>
-					<option value="live">live</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Bootappend_Install">--bootappend-install:</label> </td>
-			<td><input id="Bootappend_Install" name="bootappend_install" maxlength="256" size="50" type="text" value="" /></td>
-		</tr>
-		<!-- LIVE_GRUB_SPLASH -->
-		<tr>
-			<td><label for="Iso_Application">--iso-application:</label> </td>
-			<td><input id="Iso_Application" name="iso_application" maxlength="128" size="50" type="text" value="Debian Live" /></td>
-		</tr>
-		<tr>
-			<td><label for="Iso_Preparer">--iso-preparer:</label> </td>
-			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-build; http://live-systems.org/devel/live-build/" /></td>
-		</tr>
-		<tr>
-			<td><label for="Iso_Publisher">--iso-publisher:</label> </td>
-			<td><input id="Iso_Publisher" name="iso_publisher" maxlength="128" size="50" type="text" value="Live Systems project; http://live-systems.org/; debian-live@lists.debian.org" /></td>
-		</tr>
-		<tr>
-			<td><label for="Iso_Volume">--iso-volume:</label> </td>
-			<td><input id="Iso_Volume" name="iso_volume" maxlength="128" size="50" type="text" value="Debian Live DATE" /></td>
-		</tr>
-		<tr>
-			<td><label for="Memtest">--memtest:</label> </td>
-			<td>
-				<select id="Memtest" name="memtest" size="1">
-					<option value="memtest86">memtest86</option>
-					<option selected value="memtest86+">memtest86+</option>
-					<option value="none">none</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Net_Path">--net-path:</label> </td>
-			<td><input id="Net_Path" name="net_path" maxlength="256" size="50" type="text" value="/srv/debian-live" /></td>
-		</tr>
-		<tr>
-			<td><label for="Net_Server">--net-server:</label> </td>
-			<td><input id="Net_Server" name="net_server" maxlength="15" size="50" type="text" value="192.168.1.1" /></td>
-		</tr>
-		<!-- LIVE_SYSLINUX_SPLASH -->
-	</table>
-</div>
-
-<span id="click_5" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(5,"<b>Advanced source options</b>")'>
-	<b>Advanced source options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_5" style='margin-left:0;display:none'>
-	<table>
-		<tr>
-			<td><label for="Source">--source:</label> </td>
-			<td>
-				<select id="Source" name="source" size="1">
-					<option value="true">true</option>
-					<option selected value="false">false</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Source_Images">--source-images:</label> </td>
-			<td>
-				<select id="Source_Images" name="source_images" size="1">
-					<option value="iso">iso</option>
-					<option value="net">net</option>
-					<option selected value="tar">tar</option>
-					<option value="hdd">hdd</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-</div>
-
-</fieldset>
-
-<br />
-
-<input type="reset" value="Reset" />
-&nbsp;
-<input type="submit" value="Submit" />
-&nbsp;
-
-</form>
diff --git a/templates/cgi/debian/header.html b/templates/cgi/debian/header.html
deleted file mode 100644
index 383e2abd6..000000000
--- a/templates/cgi/debian/header.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Live Systems Project">
-    <meta name="author" content="Live Systems Project <debian-live@lists.debian.org>">
-    <!-- <meta name="keywords" content="Live Systems, free software, open source software, Debian, GNU, Linux"> -->
-    <link rel="shortcut icon" href="http://live-systems.org/images/logo-32.png">
-
-    <title>Live Systems Project</title>
-
-    <!-- Bootstrap core CSS -->
-    <link href="http://live-systems.org/stuff/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="http://live-systems.org/stuff/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
-
-    <!-- Custom styles for this template -->
-    <link href="http://live-systems.org/stuff/bootstrap/navbar.css" rel="stylesheet">
-    <link href="http://live-systems.org/stuff/bootstrap/label.css" rel="stylesheet">
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="http://live-systems.org/stuff/html5shiv/html5shiv.min.js"></script>
-      <script src="http://live-systems.org/stuff/respond/respond.min.js"></script>
-    <![endif]-->
-
-    <script type="text/javascript" language="JavaScript">
-      function collapse(x, txt) {
-        var oTemp=document.getElementById("text_"+x);
-        var oClick=document.getElementById("click_"+x);
-        if (oTemp.style.display=="block") {
-          oTemp.style.display="none";
-          oClick.innerHTML=txt+"&nbsp<small>(click to expand)<\/small><br \/>";
-        }
-        else {
-          oTemp.style.display="block";
-          oClick.innerHTML=txt+"&nbsp<small>(click to collapse)<\/small><br \/>";
-        }
-      }
-    </script>
-  </head>
-
-  <body>
-
-    <div class="container">
-
-      <!-- Static navbar -->
-      <div class="navbar navbar-default">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="/"><strong>Live</strong> Systems</a>
-        </div>
-        <div class="navbar-collapse collapse">
-          <ul class="nav navbar-nav navbar-right">
-            <li class="active"><a href="/">Build</a></li>
-            <li><a href="http://live-systems.org/">WWW</a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
diff --git a/templates/cgi/debian/mail.txt b/templates/cgi/debian/mail.txt
deleted file mode 100644
index c4ecc4b38..000000000
--- a/templates/cgi/debian/mail.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Live Systems, live-build web-frontend - Build BUILD
-From: Live Systems live-build web-frontend <debian-live@lists.debian.org>
-To: EMAIL
-
-Hi,
-
-This is live-build web-frontend <http://live-build.debian.net/> of the Live Systems project <http://live-systems.org/>.
-
-Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
-
-You can see the log file and download the image from <SERVER/BUILD/>.
-
-Note that builds are removed after 24 hours.
-
-Feedback about all Live Systems matters can be sent to our mailinglist at debian-live@lists.debian.org (no subscription required).
-
-Have fun,
-The Live Systems Team
diff --git a/templates/cgi/debian/status.html b/templates/cgi/debian/status.html
deleted file mode 100644
index 2094022b2..000000000
--- a/templates/cgi/debian/status.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<br />
-
-<h3>Build 'BUILD' shows a status of <b>STATUS</b>. Depending on the options you have selected, upon build showing a status of running it generally takes between 5 and 60 minutes to complete. Currently there are 'PNUM' build(s) being processed and 'QUEUENUM' pending build(s) waiting to be processed on the server. You will be notified by email when the attempt has completed.</h3>
-
-<h3>Your build when completed will be available at: <a href="SERVER/BUILD/">SERVER/BUILD/</a>.</h3>
-
-<fieldset>
-
-<legend><b>Options</b></legend>
-
-<b>Standard options</b>
-
-<table>
-	<tr><td>Email: </td><td>EMAIL</td></tr>
-	<tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
-	<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
-	<tr><td>--config: </td><td>_LB_CONFIG</td></tr>
-	<tr><td>--apt: </td><td>LB_APT</td></tr>
-	<tr><td>cgipackages.list.chroot: </td><td>_LB_CGIPACKAGES</td><tr>
-</table>
-
-<b>Advanced bootstrap options</b>
-
-<table>
-	<tr><td>--architectures: </td><td>LB_ARCHITECTURES</td></tr>
-	<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
-</table>
-
-<b>Advanced chroot options</b>
-
-<table>
-	<tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
-	<tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
-	<tr><td>--security: </td><td>LB_SECURITY</td></tr>
-</table>
-
-<b>Advanced binary options</b>
-
-<table>
-	<tr><td>--apt-indices: </td><td>LB_APT_INDICES</td></tr>
-	<tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
-	<tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
-	<tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
-	<tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
-	<tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
-	<tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
-	<tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
-	<tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
-	<tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
-</table>
-
-<b>Advanced source options</b>
-
-<table>
-	<tr><td>--source: </td><td>LB_SOURCE</td></tr>
-	<tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
-</table>
-
-</fieldset>
-
-<br />
-