From 4e30d10c93949e18bf37125dbf01e8dba762e0f9 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 8 Mar 2010 10:53:56 -0600 Subject: Removing LH_MIRROR_BOOTSTRAP_SECURITY in the cgi. --- cgi/cgi | 9 ++------- cgi/default | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'cgi') diff --git a/cgi/cgi b/cgi/cgi index 044886c48..2cbb56cb7 100755 --- a/cgi/cgi +++ b/cgi/cgi @@ -27,8 +27,7 @@ cat "${_TEMPLATES}"/header.html if [ -z "${QUERY_STRING}" ] then # Sending html form - sed -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \ - -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \ + sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \ -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \ -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \ -e "s/VERSION/${VERSION}/" \ @@ -60,7 +59,6 @@ else LH_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1) LH_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1) LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) - LH_MIRROR_BOOTSTRAP_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1) LH_SECTIONS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sections=[a-z]+' | cut -f 2 -d '=' | head -n1) @@ -103,8 +101,7 @@ else then echo "

Error: No email address specified.

" - sed -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \ - -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \ + sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \ -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \ -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \ -e "s/VERSION/${VERSION}/" \ @@ -128,7 +125,6 @@ else -e "s/LH_PACKAGES/${LH_PACKAGES}/" \ -e "s/LH_ARCHITECTURE/${LH_ARCHITECTURE}/" \ -e "s/LH_BOOTSTRAP_FLAVOUR/${LH_BOOTSTRAP_FLAVOUR}/" \ - -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \ -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \ -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \ -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \ @@ -178,7 +174,6 @@ LH_PACKAGES="${LH_PACKAGES}" # Advanced bootstrap options LH_ARCHITECTURE="${LH_ARCHITECTURE}" -LH_MIRROR_BOOTSTRAP_SECURITY="${LH_MIRROR_BOOTSTRAP}" LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}" LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}" LH_MIRROR_BINARY="${LH_MIRROR_BINARY}" diff --git a/cgi/default b/cgi/default index 8e08435dd..41c76ef2a 100644 --- a/cgi/default +++ b/cgi/default @@ -11,7 +11,6 @@ _TEMPLATES="/usr/share/live-helper/templates/cgi/${_MODE}" _TEMPDIR="/srv/debian-live/build/tmp" LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/" -LH_MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/" LH_MIRROR_BINARY="http://ftp.debian.org/debian/" LH_MIRROR_BINARY_SECURITY="http://security.debian.org/" -- cgit v1.2.3