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

madcoder at alioth.debian.org madcoder at alioth.debian.org
Sun Mar 16 10:02:26 UTC 2008


Author: madcoder
Date: 2008-03-16 10:02:26 +0000 (Sun, 16 Mar 2008)
New Revision: 302

Added:
   lighttpd/trunk/debian/NEWS
   lighttpd/trunk/debian/conf-available/05-auth.conf
   lighttpd/trunk/debian/conf-available/10-status.conf
   lighttpd/trunk/debian/lighttpd.preinst
Removed:
   lighttpd/trunk/debian/conf-available/10-auth.conf
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.conf
Log:
OCloses 419176


Added: lighttpd/trunk/debian/NEWS
===================================================================
--- lighttpd/trunk/debian/NEWS	                        (rev 0)
+++ lighttpd/trunk/debian/NEWS	2008-03-16 10:02:26 UTC (rev 302)
@@ -0,0 +1,20 @@
+lighttpd (1.4.19-1) unstable; urgency=low
+
+  Lighttpd must load mod_auth first, else some other modules may not work
+  properly (See #419176). For this reason, mod_status configuration has been
+  moved out from lighttpd.conf and put in conf-available/10-status.conf.
+
+  Also the files 10-auth.conf are automatically renamed by the lighttpd
+  package (provided that a sane environment is met) into 05-auth.conf, and
+  symlinks (if they exists) are also updated properly.
+
+  This is done to ensure that auth.conf is loaded first. If during your
+  lighttpd upgrade you read:
+
+    Not touching .../10-auth.conf because .../05-auth.conf exists !!!
+    Please read /usr/share/doc/lighttpd/NEWS.Debian
+
+  then you probably have both 10-auth.conf and 05-auth.conf, which is a bad
+  situation that you should fix.
+
+ -- Pierre Habouzit <madcoder at debian.org>  Sun, 16 Mar 2008 10:56:22 +0100

Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-03-16 09:38:21 UTC (rev 301)
+++ lighttpd/trunk/debian/changelog	2008-03-16 10:02:26 UTC (rev 302)
@@ -14,6 +14,13 @@
   * debian/lighttpd.cron.daily: new file, cleanup compressed cache.
     Thanks to Michal Čihař (Closes: 445224).
 
+  * be sure mod_auth is loaded first (Closes: 419176):
+     + remove mod_status from lighttpd.conf and create
+       conf-available/10-status.conf with it.
+     + add debian/lighttpd.preinst to rename 10-auth.conf into 05-auth.conf
+       automagically (when it's a sane thing to do).
+     + Document all that in NEWS.Debian.
+
  -- Pierre Habouzit <madcoder at debian.org>  Sun, 16 Mar 2008 10:11:45 +0100
 
 lighttpd (1.4.18-4) unstable; urgency=high

Copied: lighttpd/trunk/debian/conf-available/05-auth.conf (from rev 297, lighttpd/trunk/debian/conf-available/10-auth.conf)
===================================================================
--- lighttpd/trunk/debian/conf-available/05-auth.conf	                        (rev 0)
+++ lighttpd/trunk/debian/conf-available/05-auth.conf	2008-03-16 10:02:26 UTC (rev 302)
@@ -0,0 +1,28 @@
+## Authentication for lighttpd
+##
+## Documentation: /usr/share/doc/lighttpd-doc/authentication.txt.gz
+##                http://www.lighttpd.net/documentation/authentication.html
+
+server.modules                += ( "mod_auth" )
+
+# auth.backend                 = "plain"
+# auth.backend.plain.userfile  = "lighttpd.user"
+# auth.backend.plain.groupfile = "lighttpd.group"
+
+# auth.backend.ldap.hostname   = "localhost"
+# auth.backend.ldap.base-dn    = "dc=my-domain,dc=com"
+# auth.backend.ldap.filter     = "(uid=$)"
+
+# auth.require                 = ( "/server-status" => 
+#                                ( 
+#				  "method"  => "digest",
+#				  "realm"   => "download archiv",
+#				  "require" => "group=www|user=jan|host=192.168.2.10"
+#				),
+#				"/server-info" => 
+#                                ( 
+#				  "method"  => "digest",
+#				  "realm"   => "download archiv",
+#				  "require" => "group=www|user=jan|host=192.168.2.10"
+#				)
+#                              )

Deleted: lighttpd/trunk/debian/conf-available/10-auth.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-auth.conf	2008-03-16 09:38:21 UTC (rev 301)
+++ lighttpd/trunk/debian/conf-available/10-auth.conf	2008-03-16 10:02:26 UTC (rev 302)
@@ -1,28 +0,0 @@
-## Authentication for lighttpd
-##
-## Documentation: /usr/share/doc/lighttpd-doc/authentication.txt.gz
-##                http://www.lighttpd.net/documentation/authentication.html
-
-server.modules                += ( "mod_auth" )
-
-# auth.backend                 = "plain"
-# auth.backend.plain.userfile  = "lighttpd.user"
-# auth.backend.plain.groupfile = "lighttpd.group"
-
-# auth.backend.ldap.hostname   = "localhost"
-# auth.backend.ldap.base-dn    = "dc=my-domain,dc=com"
-# auth.backend.ldap.filter     = "(uid=$)"
-
-# auth.require                 = ( "/server-status" => 
-#                                ( 
-#				  "method"  => "digest",
-#				  "realm"   => "download archiv",
-#				  "require" => "group=www|user=jan|host=192.168.2.10"
-#				),
-#				"/server-info" => 
-#                                ( 
-#				  "method"  => "digest",
-#				  "realm"   => "download archiv",
-#				  "require" => "group=www|user=jan|host=192.168.2.10"
-#				)
-#                              )

Added: lighttpd/trunk/debian/conf-available/10-status.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-status.conf	                        (rev 0)
+++ lighttpd/trunk/debian/conf-available/10-status.conf	2008-03-16 10:02:26 UTC (rev 302)
@@ -0,0 +1,19 @@
+## mod_status generates the status overview of the webserver.
+##
+## Documentation: /usr/share/doc/lighttpd-doc/status.txt
+##      http://trac.lighttpd.net/trac/wiki/Docs%3AModStatus
+
+server.modules += ( "mod_status" )
+
+## relative URL which is used to retrieve the status-page
+status.status-url = "/server-status"
+
+## relative URL for the config page which displays the loaded modules
+# status.config-url = "/server-config"
+
+## relative URL for a plain-text page containing the internal statistics
+# status.statistics-url = "/server-statistics"
+
+## add JavaScript which allows client-side sorting for the connection overview
+## default: enable
+# status.enable-sort = "disable"

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2008-03-16 09:38:21 UTC (rev 301)
+++ lighttpd/trunk/debian/lighttpd.conf	2008-03-16 10:02:26 UTC (rev 302)
@@ -16,7 +16,6 @@
             "mod_compress",
 #           "mod_rewrite", 
 #           "mod_redirect", 
-#           "mod_status", 
 #           "mod_evhost",
 #           "mod_usertrack",
 #           "mod_rrdtool",
@@ -101,9 +100,6 @@
 compress.cache-dir          = "/var/cache/lighttpd/compress/"
 compress.filetype           = ("text/plain", "text/html", "application/x-javascript", "text/css")
 
-#### status module
-# status.status-url = "/server-status"
-# status.config-url = "/server-config"
 
 #### url handling modules (rewrite, redirect, access)
 # url.rewrite                 = ( "^/$"             => "/server-status" )

Added: lighttpd/trunk/debian/lighttpd.preinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.preinst	                        (rev 0)
+++ lighttpd/trunk/debian/lighttpd.preinst	2008-03-16 10:02:26 UTC (rev 302)
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+# preinst script for lighttpd
+
+CA=/etc/lighttpd/conf-available
+CE=/etc/lighttpd/conf-enabled
+
+if test -f "$CA/10-auth.conf"; then
+    if test -f "$CA/05-auth.conf"; then
+        echo 1>&2 "Not touching conf-available/10-auth.conf because conf-available/05-auth.conf exists !!!"
+        echo 1>&2 "Please read /usr/share/doc/lighttpd/NEWS.Debian"
+    else
+        echo "Renaming conf-available/10-auth.conf into conf-available/05-auth.conf"
+        mv "$CA/10-auth.conf" "$CA/05-auto.conf"
+    fi
+fi
+
+if test -f "$CE/10-auth.conf"; then
+    if test -f "$CE/05-auth.conf"; then
+        echo 1>&2 "Not touching conf-enabled/10-auth.conf because conf-enabled/05-auth.conf exists !!!"
+        echo 1>&2 "Please read /usr/share/doc/lighttpd/NEWS.Debian"
+    else
+        if test -h "$CE/10-auth.conf" && test "$(readlink -m "$CE/10-auth.conf")" = "$CE/10-auth.conf"; then
+            echo "Updating conf-enabled symlink to 05-auth.conf accordingly"
+            rm -f "$CE/10-auth.conf"
+            ln -s "../conf-available/05-auth.conf" "$CE/05-auth.conf"
+        fi
+        if test -f "$CE/10-auth.conf"; then
+            echo "Renaming conf-enabled/10-auth.conf into conf-enabled/05-auth.conf"
+            mv "$CE/10-auth.conf" "$CE/05-auth.conf"
+        fi
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0




More information about the pkg-lighttpd-maintainers mailing list