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

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-04-13 10:46:42 +0000 (Sun, 13 Apr 2008)
New Revision: 319

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.conf
   lighttpd/trunk/debian/lighttpd.cron.daily
   lighttpd/trunk/debian/lighttpd.dirs
Log:
Add handling of /var/cache/lighttpd/uploads (Closes: 408521)



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-13 10:24:12 UTC (rev 318)
+++ lighttpd/trunk/debian/changelog	2008-04-13 10:46:42 UTC (rev 319)
@@ -6,6 +6,11 @@
     spurious errors for uninstalled and not purged lighttpd's
     (Closes: 472175).
 
+  * Add handling of /var/cache/lighttpd/uploads (Closes: 408521):
+     + add it in lighttpd.dirs.
+     + add it as a server.upload-dirs in lighttpd.conf.
+     + purge it daily in lighttpd.cron.daily.
+
  -- Pierre Habouzit <madcoder at debian.org>  Thu, 20 Mar 2008 00:53:45 +0100
 
 lighttpd (1.4.19-1~bpo40+1) etch-backports; urgency=low

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2008-04-13 10:24:12 UTC (rev 318)
+++ lighttpd/trunk/debian/lighttpd.conf	2008-04-13 10:46:42 UTC (rev 319)
@@ -1,5 +1,5 @@
 # Debian lighttpd configuration file
-# 
+#
 
 ############ Options you really have to take care of ####################
 
@@ -9,13 +9,13 @@
 # - saves some time
 # - saves memory
 
-server.modules              = ( 
+server.modules              = (
             "mod_access",
             "mod_alias",
             "mod_accesslog",
             "mod_compress",
-#           "mod_rewrite", 
-#           "mod_redirect", 
+#           "mod_rewrite",
+#           "mod_redirect",
 #           "mod_evhost",
 #           "mod_usertrack",
 #           "mod_rrdtool",
@@ -23,12 +23,15 @@
 #           "mod_expire",
 #           "mod_flv_streaming",
 #           "mod_evasive"
- )
+)
 
-## a static document-root, for virtual-hosting take look at the 
+## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
 server.document-root       = "/var/www/"
 
+## where to upload files to, purged daily.
+server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
+
 ## where to send error-messages to
 server.errorlog            = "/var/log/lighttpd/error.log"
 
@@ -57,7 +60,7 @@
 # .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
- 
+
 ######### Options that are good to be but not neccesary to be changed #######
 
 ## Use ipv6
@@ -76,7 +79,7 @@
 ## to help the rc.scripts
 server.pid-file            = "/var/run/lighttpd.pid"
 
-## 
+##
 ## Format: <errorfile-prefix><status>.html
 ## -> ..../status-404.html for 'File not found'
 #server.errorfile-prefix    = "/var/www/"
@@ -144,7 +147,7 @@
 ## mimetype mapping
 include_shell "/usr/share/lighttpd/create-mime.assign.pl"
 
-## load enabled configuration files, 
+## load enabled configuration files,
 ## read /etc/lighttpd/conf-available/README first
 include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 

Modified: lighttpd/trunk/debian/lighttpd.cron.daily
===================================================================
--- lighttpd/trunk/debian/lighttpd.cron.daily	2008-04-13 10:24:12 UTC (rev 318)
+++ lighttpd/trunk/debian/lighttpd.cron.daily	2008-04-13 10:46:42 UTC (rev 319)
@@ -1,5 +1,10 @@
 #!/bin/sh
 # Cleanup lighttpd compress cache
-if test -d /var/cache/lighttpd/compress; then
-    su -s /bin/sh -c "find /var/cache/lighttpd/compress -type f -atime +30 -print0 | xargs -0 -r rm" www-data
+
+cache=/var/cache/lighttpd
+if test -d "$cache/compress"; then
+    su -s /bin/sh -c "find $cache/compress -type f -atime +30 -print0 | xargs -0 -r rm" www-data
 fi
+if test -d "$cache/uploads"; then
+    su -s /bin/sh -c "find $cache/uploads -type f -atime +1 -print0 | xargs -0 -r rm" www-data
+fi

Modified: lighttpd/trunk/debian/lighttpd.dirs
===================================================================
--- lighttpd/trunk/debian/lighttpd.dirs	2008-04-13 10:24:12 UTC (rev 318)
+++ lighttpd/trunk/debian/lighttpd.dirs	2008-04-13 10:46:42 UTC (rev 319)
@@ -1,6 +1,7 @@
 var/www
 var/log/lighttpd
 var/cache/lighttpd/compress
+var/cache/lighttpd/uploads
 etc/lighttpd/conf-available
 etc/lighttpd/conf-enabled
 usr/sbin