diff options
Diffstat (limited to 'cgi')
| -rwxr-xr-x | cgi/live-build-cgi | 21 | ||||
| -rw-r--r-- | cgi/live-build-cgi.default | 4 |
2 files changed, 3 insertions, 22 deletions
diff --git a/cgi/live-build-cgi b/cgi/live-build-cgi index bf3c772d3..655418a79 100755 --- a/cgi/live-build-cgi +++ b/cgi/live-build-cgi @@ -39,10 +39,7 @@ cat "${_TEMPLATES}"/header.html if [ -z "${QUERY_STRING}" ] then # Sending html form - sed -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \ - -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \ - -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \ - -e "s/VERSION/${VERSION}/" \ + sed -e "s/VERSION/${VERSION}/" \ -e "s/DATE/`date +%Y%m%d-%H:%M`/" \ "${_TEMPLATES}"/form.html else @@ -75,9 +72,6 @@ else # Advanced bootstrap options LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) LB_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1) - LB_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1) - LB_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1) - LB_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[-0-9a-zA-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 @@ -114,10 +108,7 @@ else then echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>" - sed -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \ - -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \ - -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \ - -e "s/VERSION/${VERSION}/" \ + sed -e "s/VERSION/${VERSION}/" \ -e "s/DATE/`date +%Y%m%d-%H:%M`/" \ "${_TEMPLATES}"/form.html @@ -139,9 +130,6 @@ else -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \ -e "s/LB_BOOTSTRAP_FLAVOUR/${LB_BOOTSTRAP_FLAVOUR}/" \ - -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \ - -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \ - -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \ -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ @@ -189,9 +177,6 @@ LB_TASKS="${LB_TASKS}" # Advanced bootstrap options LB_ARCHITECTURES="${LB_ARCHITECTURES}" -LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}" -LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}" -LB_MIRROR_BINARY="${LB_MIRROR_BINARY}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" # Advanced chroot options @@ -226,7 +211,7 @@ LB_ARCHIVES="${LB_ARCHIVES}" EOF echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live - echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|package_lists ${LB_PACKAGE_LISTS}|tasks ${LB_TASKS}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|mirror_bootstrap_security ${LB_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LB_MIRROR_BOOTSTRAP}|mirror_binary_security ${LB_MIRROR_BINARY_SECURITY}|mirror_binary ${LB_MIRROR_BINARY}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_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}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live + echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|package_lists ${LB_PACKAGE_LISTS}|tasks ${LB_TASKS}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_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}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live fi sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html diff --git a/cgi/live-build-cgi.default b/cgi/live-build-cgi.default index dc304a673..73daa586c 100644 --- a/cgi/live-build-cgi.default +++ b/cgi/live-build-cgi.default @@ -10,8 +10,4 @@ _DESTDIR="/srv/debian-live/build/www" _TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}" _TEMPDIR="/srv/debian-live/build/tmp" -LB_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" -LB_MIRROR_BINARY="http://ftp.debian.org/debian/" -LB_MIRROR_BINARY_SECURITY="http://security.debian.org/" - _SERVER="http://live.debian.net/build" |