[Debian-live-changes] r1738 - in dists/trunk/live-webbuilder: . debian

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-25 16:42:51 +0000 (Fri, 25 May 2007)
New Revision: 1738

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


Modified: dists/trunk/live-webbuilder/Makefile
===================================================================
--- dists/trunk/live-webbuilder/Makefile	2007-05-25 14:59:08 UTC (rev 1737)
+++ dists/trunk/live-webbuilder/Makefile	2007-05-25 16:42:51 UTC (rev 1738)
@@ -24,6 +24,11 @@
 	# Installing documentation
 	install -D -m 0644 COPYING $(DESTDIR)/usr/share/doc/live-webbuilder/COPYING
 
+	# Installing logfile
+	install -d 0755 $(DESTDIR)/var/log
+	touch $(DESTDIR)/var/log/live-webbuilder
+	chown www-data:www-data $(DESTDIR)/var/log/live-webbuilder
+
 uninstall:
 	# Uninstalling executables
 	rm -f $(DESTDIR)/etc/cron.d/live-webbuilder
@@ -36,6 +41,9 @@
 	# Uninstalling documentation
 	rm -rf $(DESTDIR)/usr/share/doc/live-webbuilder
 
+	# Uninstalling logfile
+	rm -f $(DESTDIR)/var/log/live-webbuilder
+
 update:
 	sed -i -e 's/VERSION="0.2.7"/VERSION="0.2.x"/' default
 

Modified: dists/trunk/live-webbuilder/cron
===================================================================
--- dists/trunk/live-webbuilder/cron	2007-05-25 14:59:08 UTC (rev 1737)
+++ dists/trunk/live-webbuilder/cron	2007-05-25 16:42:51 UTC (rev 1738)
@@ -37,8 +37,13 @@
 touch /var/lock/live-webbuilder.lock
 
 # Cleanup old builds: cron should be run at least once per hour to take effect
-rm -rf "${DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
+if ls "${DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
+then
+	rm -rf "${DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
 
+	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webbuilder: removing build `date -d yesterday +%Y%m%d.%H`" >> /var/log/live-webbuilder
+fi
+
 # Ok from here spin through the live-webbuilder files we have waiting to build
 if ls "${TEMPDIR}"/*.build &> /dev/null
 then
@@ -47,6 +52,8 @@
 		# Reading build file
 		. "${FILE}"
 
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webbuilder: begin build ${BUILD}" >> /var/log/live-webbuilder
+
 		# Assembling options
 		if [ -n "${BINARY_IMAGE}" ]
 		then
@@ -177,5 +184,7 @@
 
 		# Removing build directory
 		rm -rf "${TEMPDIR}"/"${BUILD}"
+
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webbuilder: end build ${BUILD}" >> /var/log/live-webbuilder
 	done
 fi

Added: dists/trunk/live-webbuilder/debian/postinst
===================================================================
--- dists/trunk/live-webbuilder/debian/postinst	                        (rev 0)
+++ dists/trunk/live-webbuilder/debian/postinst	2007-05-25 16:42:51 UTC (rev 1738)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+	configure)
+		chown www-data:www-data /var/log/live-webbuilder
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0


Property changes on: dists/trunk/live-webbuilder/debian/postinst
___________________________________________________________________
Name: svn:executable
   + *

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-25 14:59:08 UTC (rev 1737)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-25 16:42:51 UTC (rev 1738)
@@ -103,3 +103,5 @@
 fi
 
 sed -e "s/VERSION/${VERSION}/" "${TEMPLATES}"/footer.html
+
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webbuilder: recieved build ${BUILD}" >> /var/log/live-webbuilder