[pkg-lighttpd] r512 - lighttpd/trunk/debian

[Olaf van der Spek]

Author: olafvdspek-guest
Date: 2011-01-03 22:03:33 +0000 (Mon, 03 Jan 2011)
New Revision: 512

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.postinst
   lighttpd/trunk/debian/rules
Log:
Don't fail install if server fails to start (closes: #383425)


Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2011-01-03 21:47:49 UTC (rev 511)
+++ lighttpd/trunk/debian/changelog	2011-01-03 22:03:33 UTC (rev 512)
@@ -1,3 +1,9 @@
+lighttpd (1.4.28-3) unstable; urgency=low
+
+  * Don't fail install if server fails to start (closes: #383425)
+
+ -- Olaf van der Spek <olaf at testing>  Mon, 03 Jan 2011 22:56:38 +0100
+
 lighttpd (1.4.28-2) unstable; urgency=medium
 
   [ Olaf van der Spek ]

Modified: lighttpd/trunk/debian/lighttpd.postinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.postinst	2011-01-03 21:47:49 UTC (rev 511)
+++ lighttpd/trunk/debian/lighttpd.postinst	2011-01-03 22:03:33 UTC (rev 512)
@@ -9,9 +9,14 @@
 	chown www-data:www-data /var/log/lighttpd
         chown www-data:www-data /var/cache/lighttpd /var/cache/lighttpd/compress /var/cache/lighttpd/uploads
 	chmod 0750 /var/log/lighttpd
-
 fi
 
+start_failed() 
+{
+	echo "Failed to start Lighttpd. Is another webserver running already?"
+	exit 0
+}
+
 #DEBHELPER#
 
 exit 0

Modified: lighttpd/trunk/debian/rules
===================================================================
--- lighttpd/trunk/debian/rules	2011-01-03 21:47:49 UTC (rev 511)
+++ lighttpd/trunk/debian/rules	2011-01-03 22:03:33 UTC (rev 512)
@@ -32,3 +32,6 @@
 
 %:
 	dh $@
+
+override_dh_installinit:
+	dh_installinit --error-handler=start_failed