[Debian-live-changes] r1599 - dists/trunk/live-webbuilder

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-22 16:14:38 +0000 (Tue, 22 May 2007)
New Revision: 1599

Added:
   dists/trunk/live-webbuilder/defaults
Modified:
   dists/trunk/live-webbuilder/Makefile
   dists/trunk/live-webbuilder/cron-webbuilder
Log:


Modified: dists/trunk/live-webbuilder/Makefile
===================================================================
--- dists/trunk/live-webbuilder/Makefile	2007-05-22 16:04:19 UTC (rev 1598)
+++ dists/trunk/live-webbuilder/Makefile	2007-05-22 16:14:38 UTC (rev 1599)
@@ -11,6 +11,7 @@
 install: test
 	# Installing executables
 	install -D -m 0755 cron-webbuilder $(DESTDIR)/etc/cron.d/live-webbuilder
+	install -D -m 0755 defaults $(DESTDIR)/etc/default/live-webbuilder
 	install -D -m 0755 live-webbuilder $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
 
 	# Installing templates
@@ -23,6 +24,7 @@
 uninstall:
 	# Uninstalling executables
 	rm -f $(DESTDIR)/etc/cron.d/live-webbuilder
+	rm -f $(DESTDIR)/etc/default/live-webbuilder
 	rm -f $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
 
 	# Uninstalling shared data

Modified: dists/trunk/live-webbuilder/cron-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/cron-webbuilder	2007-05-22 16:04:19 UTC (rev 1598)
+++ dists/trunk/live-webbuilder/cron-webbuilder	2007-05-22 16:14:38 UTC (rev 1599)
@@ -9,15 +9,20 @@
 
 set -e
 
-# Set some global parameters
-DESTDIR="/var/www/live-webbuilder"
-MIRROR="http://localhost/debian/"
-MIRROR_IMAGE="http://localhost/debian/"
-MIRROR_SECURITY="http://ftp.us.debian.org/debian-security/"
-SITE_SERVER="http://localhost/live-webbuilder"
-TEMPDIR="/tmp"
-MAILER=""
+# Reading defaults
+if [ -r /etc/defaults/live-webbuilder ]
+then
+	. /etc/defaults/live-webbuilder
+else
+	exit 0
+fi
 
+# Exit if disabled
+if [ "${WEBBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
 # Checking lock file
 if [ -f /var/lock/live-webbuilder ]
 then
@@ -51,7 +56,7 @@
 		MAILER="Greetings,\nBeginning you build at: `date -R`"
 		echo "Begin: `date -R`"  > "${DESTDIR}"/${BUILD_ID}/log.txt
 		# Below is where we try to put is all together.
-		make-live --root "${DESTDIR}"/${BUILD_ID} --mirror-build ${MIRROR} --mirror-image ${MIRROR_IMAGE} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distribution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}" --iso-volume "${ISO_VOLUME}" >> "${DESTDIR}"/${BUILD_ID}/log.txt 2>&1
+		make-live --root "${DESTDIR}"/${BUILD_ID} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --packages-lists ${PACKAGES_LISTS} --binary-image ${BINARY_IMAGE} --distribution ${DISTRIBUTION} --filesystem ${FILESYSTEM} --packages "${PACKAGES}" --iso-volume "${ISO_VOLUME}" >> "${DESTDIR}"/${BUILD_ID}/log.txt 2>&1
 		MAILER="${MAILER}\nEnding your build at: `date -R`\nTo download your debian-live build see ${SITE_SERVER}/${BUILD_ID} "
 		echo "Ending: `date -R`"  >> "${DESTDIR}"/${BUILD_ID}/log.txt
 		echo  ${MAILER} | mail -s "End build od id - ${BUILD_ID}" ${EMAIL}
@@ -73,6 +78,5 @@
 		then
 			umount "${DESTDIR}"/${BUILD_ID}/chroot/sys
 		fi
-
 	fi
 done

Added: dists/trunk/live-webbuilder/defaults
===================================================================
--- dists/trunk/live-webbuilder/defaults	                        (rev 0)
+++ dists/trunk/live-webbuilder/defaults	2007-05-22 16:14:38 UTC (rev 1599)
@@ -0,0 +1,14 @@
+# Defaults for /etc/cron.daily/live-webbuilder
+
+WEBBUILD="disabled"
+
+DESTDIR="/var/www/live-webbuilder"
+TEMPDIR="/tmp"
+
+MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
+MIRROR_IMAGE="http://ftp.debian.org/debian/"
+MIRROR_IMAGE_SECURITY="http://security.debian.org/"
+
+SITE_SERVER="http://localhost/live-webbuilder"
+MAILER=""