[pkg-lighttpd] r254 - in lighttpd/trunk/debian: . conf-available

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2007-08-03 08:09:46 +0000 (Fri, 03 Aug 2007)
New Revision: 254

Added:
   lighttpd/trunk/debian/conf-available/10-webdav.conf
Removed:
   lighttpd/trunk/debian/conf-enabled/
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/init.d
   lighttpd/trunk/debian/lighttpd-mod-webdav.install
   lighttpd/trunk/debian/lighttpd.install
   lighttpd/trunk/debian/lighttpd.postinst
Log:
* debian/conf-available/10-webdav.conf: add default configuration for webdav.
  (closes: #406641).
* debian/conf-enabled: remove directory, it is already installed through
  lighttpd.dirs.
* lighttpd.postinst, lighttpd.postrm, init.d: be sure there is a
  /var/run/lighttpd owned by www-data:www-data, helpful to store locks and
  things like that.



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2007-08-01 20:26:17 UTC (rev 253)
+++ lighttpd/trunk/debian/changelog	2007-08-03 08:09:46 UTC (rev 254)
@@ -21,8 +21,15 @@
      + Drop Recommands on php5-cgi, there is absolutely no reason to have it,
        or we would have to recommend ruby, python, lua, perl, .... and every
        $language on earth to be fair.  (closes: #435587).
+  * debian/conf-available/10-webdav.conf: add default configuration for webdav.
+    (closes: #406641).
+  * debian/conf-enabled: remove directory, it is already installed through
+    lighttpd.dirs.
+  * lighttpd.postinst, lighttpd.postrm, init.d: be sure there is a
+    /var/run/lighttpd owned by www-data:www-data, helpful to store locks and
+    things like that.
 
- -- Pierre Habouzit <madcoder at debian.org>  Wed, 01 Aug 2007 22:24:01 +0200
+ -- Pierre Habouzit <madcoder at debian.org>  Fri, 03 Aug 2007 10:06:15 +0200
 
 lighttpd (1.4.16-1) unstable; urgency=low
 

Added: lighttpd/trunk/debian/conf-available/10-webdav.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-webdav.conf	                        (rev 0)
+++ lighttpd/trunk/debian/conf-available/10-webdav.conf	2007-08-03 08:09:46 UTC (rev 254)
@@ -0,0 +1,13 @@
+## WebDAV stands for Web-based Distributed Authoring and Versioning.  
+## The term also refers to the set of extensions to the HTTP protocol that
+## the group defined which allows users to collaboratively edit and manage
+## files on remote web servers.
+##
+## Documentation: /usr/share/doc/lighttpd-doc/webdav.txt
+##                http://trac.lighttpd.net/trac/wiki/Docs%3AModWebDAV
+
+server.modules += ( "mod_webdav" )
+
+## The full path to the file you would like to use as your db file.  This
+## is required for webdav props and locks.
+webdav.sqlite-db-name = "/var/run/lighttpd/lighttpd.webdav_lock.db"

Modified: lighttpd/trunk/debian/init.d
===================================================================
--- lighttpd/trunk/debian/init.d	2007-08-01 20:26:17 UTC (rev 253)
+++ lighttpd/trunk/debian/init.d	2007-08-03 08:09:46 UTC (rev 254)
@@ -22,6 +22,11 @@
 
 set -e
 
+# be sure there is a /var/run/lighttpd, even with tmpfs
+mkdir -p /var/run/lighttpd > /dev/null 2> /dev/null
+chown www-data:www-data /var/run/lighttpd
+chmod 0750 /var/run/lighttpd
+
 . /lib/lsb/init-functions
 
 case "$1" in

Modified: lighttpd/trunk/debian/lighttpd-mod-webdav.install
===================================================================
--- lighttpd/trunk/debian/lighttpd-mod-webdav.install	2007-08-01 20:26:17 UTC (rev 253)
+++ lighttpd/trunk/debian/lighttpd-mod-webdav.install	2007-08-03 08:09:46 UTC (rev 254)
@@ -1 +1,2 @@
 debian/tmp/usr/lib/lighttpd/mod_webdav.so
+debian/conf-available/10-webdav.conf        /etc/lighttpd/conf-available

Modified: lighttpd/trunk/debian/lighttpd.install
===================================================================
--- lighttpd/trunk/debian/lighttpd.install	2007-08-01 20:26:17 UTC (rev 253)
+++ lighttpd/trunk/debian/lighttpd.install	2007-08-03 08:09:46 UTC (rev 254)
@@ -28,18 +28,17 @@
 debian/tmp/usr/lib/lighttpd/mod_status.so
 debian/tmp/usr/lib/lighttpd/mod_userdir.so
 debian/tmp/usr/lib/lighttpd/mod_usertrack.so
-debian/lighttpd.conf /etc/lighttpd
-debian/conf-enabled /etc/lighttpd
-debian/conf-available/10-auth.conf /etc/lighttpd/conf-available     
-debian/conf-available/10-proxy.conf /etc/lighttpd/conf-available 
-debian/conf-available/10-cgi.conf /etc/lighttpd/conf-available      
-debian/conf-available/10-simple-vhost.conf /etc/lighttpd/conf-available
-debian/conf-available/10-userdir.conf /etc/lighttpd/conf-available   
-debian/conf-available/10-ssi.conf /etc/lighttpd/conf-available
-debian/conf-available/10-fastcgi.conf /etc/lighttpd/conf-available  
-debian/conf-available/10-ssl.conf /etc/lighttpd/conf-available
-debian/conf-available/README /etc/lighttpd/conf-available
-debian/create-mime.assign.pl /usr/share/lighttpd/
-debian/include-conf-enabled.pl /usr/share/lighttpd/
-debian/lighty-enable-mod /usr/sbin/
-debian/index.html /usr/share/lighttpd/
+debian/lighttpd.conf                        /etc/lighttpd
+debian/conf-available/10-auth.conf          /etc/lighttpd/conf-available
+debian/conf-available/10-proxy.conf         /etc/lighttpd/conf-available
+debian/conf-available/10-cgi.conf           /etc/lighttpd/conf-available
+debian/conf-available/10-simple-vhost.conf  /etc/lighttpd/conf-available
+debian/conf-available/10-userdir.conf       /etc/lighttpd/conf-available
+debian/conf-available/10-ssi.conf           /etc/lighttpd/conf-available
+debian/conf-available/10-fastcgi.conf       /etc/lighttpd/conf-available
+debian/conf-available/10-ssl.conf           /etc/lighttpd/conf-available
+debian/conf-available/README                /etc/lighttpd/conf-available
+debian/create-mime.assign.pl                /usr/share/lighttpd/
+debian/include-conf-enabled.pl              /usr/share/lighttpd/
+debian/lighty-enable-mod                    /usr/sbin/
+debian/index.html                           /usr/share/lighttpd/

Modified: lighttpd/trunk/debian/lighttpd.postinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.postinst	2007-08-01 20:26:17 UTC (rev 253)
+++ lighttpd/trunk/debian/lighttpd.postinst	2007-08-03 08:09:46 UTC (rev 254)
@@ -8,8 +8,9 @@
    	then
    		cp /usr/share/lighttpd/index.html /var/www/index.lighttpd.html
 	fi
-	chown www-data:www-data /var/log/lighttpd
-	chmod 0750 /var/log/lighttpd
+        mkdir -p /var/run/lighttpd > /dev/null 2> /dev/null
+	chown www-data:www-data /var/log/lighttpd /var/run/lighttpd
+	chmod 0750 /var/log/lighttpd /var/run/lighttpd
 	chown www-data:www-data -R /var/cache/lighttpd
 fi