From 8ccfefbf23f35e1b6080d096c1768e679be8a13b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 5 Jun 2012 20:41:26 +0200 Subject: [PATCH] Dropping different debian cgi templates and use only the one used on live-build.debian.net. --- frontends/cgi/live-build-cgi.default | 2 +- templates/cgi/debian-unofficial/build.html | 73 ---- templates/cgi/debian-unofficial/footer.html | 8 - templates/cgi/debian-unofficial/form.html | 316 ------------------ templates/cgi/debian-unofficial/header.html | 38 --- templates/cgi/debian-unofficial/mail.txt | 18 - .../{debian-official => debian}/build.html | 0 .../{debian-official => debian}/footer.html | 0 .../cgi/{debian-official => debian}/form.html | 0 .../{debian-official => debian}/header.html | 0 .../cgi/{debian-official => debian}/mail.txt | 0 11 files changed, 1 insertion(+), 454 deletions(-) delete mode 100644 templates/cgi/debian-unofficial/build.html delete mode 100644 templates/cgi/debian-unofficial/footer.html delete mode 100644 templates/cgi/debian-unofficial/form.html delete mode 100644 templates/cgi/debian-unofficial/header.html delete mode 100644 templates/cgi/debian-unofficial/mail.txt rename templates/cgi/{debian-official => debian}/build.html (100%) rename templates/cgi/{debian-official => debian}/footer.html (100%) rename templates/cgi/{debian-official => debian}/form.html (100%) rename templates/cgi/{debian-official => debian}/header.html (100%) rename templates/cgi/{debian-official => debian}/mail.txt (100%) diff --git a/frontends/cgi/live-build-cgi.default b/frontends/cgi/live-build-cgi.default index 73daa586c..50ff303ab 100644 --- a/frontends/cgi/live-build-cgi.default +++ b/frontends/cgi/live-build-cgi.default @@ -2,7 +2,7 @@ _WEBBUILD="disabled" -_MODE="debian-official" +_MODE="debian" _DEBUG="disabled" diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html deleted file mode 100644 index 64f06cb17..000000000 --- a/templates/cgi/debian-unofficial/build.html +++ /dev/null @@ -1,73 +0,0 @@ -
- -

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 20 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.

- -

Your build will be available at: SERVER/BUILD/.

- -
- -Options - -Standard options - - - - - - - - -
Email: EMAIL
--binary-image: LB_BINARY_IMAGES
--distribution: LB_DISTRIBUTION
--package-lists: LB_PACKAGE_LISTS
--tasks: LB_TASKS
cgipackages.list.chroot: _LB_CGIPACKAGES
- -Advanced bootstrap options - - - - - -
--architectures: LB_ARCHITECTURES
--bootstrap-flavour: LB_BOOTSTRAP_FLAVOUR
--archive-areas: LB_ARCHIVE_AREAS
- -Advanced chroot options - - - - - -
--chroot-fileystem: LB_CHROOT_FILESYSTEM
--linux-flavours: LB_LINUX_FLAVOURS
--security: LB_SECURITY
- -Advanced binary options - - - - - - - - - - - - - - -
--apt-indices: LB_BINARY_INDICES
--bootappend-live: LB_BOOTAPPEND_LIVE
--bootloader: LB_BOOTLOADER
--debian-installer: LB_DEBIAN_INSTALLER
--bootappend-install: LB_BOOTAPPEND_INSTALL
--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
- -Advanced source options - - - - -
--source: LB_SOURCE
--source-images: LB_SOURCE_IMAGES
- -Unofficial options - - - - -
custom.bootstrap: CUSTOM_BOOTSTRAP
custom.binary: CUSTOM_BINARY
- -
- -
- -

Thank you for your submission.

diff --git a/templates/cgi/debian-unofficial/footer.html b/templates/cgi/debian-unofficial/footer.html deleted file mode 100644 index 6c2ce27cb..000000000 --- a/templates/cgi/debian-unofficial/footer.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html deleted file mode 100644 index 3483c6593..000000000 --- a/templates/cgi/debian-unofficial/form.html +++ /dev/null @@ -1,316 +0,0 @@ -

Submit your parameters (working email address is required) to generate your very own Debian Live system.

- -
- -
- -Options - - - - - - -
- - - Standard options (click to collapse) -
- - -
- - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
-
- - - Advanced bootstrap options (click to expand) -
- - - - - - Advanced chroot options (click to expand) -
- - - - - - Advanced binary options (click to expand) -
- - - - - - Advanced source options (click to expand) -
- - - - - - Unofficial options (click to expand) -
- - - - -
- -
- - -  - -  - -
diff --git a/templates/cgi/debian-unofficial/header.html b/templates/cgi/debian-unofficial/header.html deleted file mode 100644 index 096303e25..000000000 --- a/templates/cgi/debian-unofficial/header.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - Debian Live Build - - - - - - - - - - - - -
-

live-build web-frontend of the Debian Live Project

-

Live Debian systems!

-
diff --git a/templates/cgi/debian-unofficial/mail.txt b/templates/cgi/debian-unofficial/mail.txt deleted file mode 100644 index 1b52405c6..000000000 --- a/templates/cgi/debian-unofficial/mail.txt +++ /dev/null @@ -1,18 +0,0 @@ -Subject: Debian Live, live-build web-frontend - Build BUILD -From: Debian Live live-build web-frontend -To: EMAIL - -Hi, - -This is live-build web-frontend of the Debian Live project . - -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 . - -Note that builds are removed after 24 hours. - -Feedback about all Debian Live matters can be sent to our mailinglist at debian-live@lists.debian.org (no subscription required). - -Have fun, -The Debian Live Team diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian/build.html similarity index 100% rename from templates/cgi/debian-official/build.html rename to templates/cgi/debian/build.html diff --git a/templates/cgi/debian-official/footer.html b/templates/cgi/debian/footer.html similarity index 100% rename from templates/cgi/debian-official/footer.html rename to templates/cgi/debian/footer.html diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian/form.html similarity index 100% rename from templates/cgi/debian-official/form.html rename to templates/cgi/debian/form.html diff --git a/templates/cgi/debian-official/header.html b/templates/cgi/debian/header.html similarity index 100% rename from templates/cgi/debian-official/header.html rename to templates/cgi/debian/header.html diff --git a/templates/cgi/debian-official/mail.txt b/templates/cgi/debian/mail.txt similarity index 100% rename from templates/cgi/debian-official/mail.txt rename to templates/cgi/debian/mail.txt