[pkg-lighttpd] r490 - in lighttpd/trunk/debian: . conf-available conf-available2
Olaf van der Spek
olafvdspek-guest at alioth.debian.org
Sat Oct 23 15:51:13 UTC 2010
Author: olafvdspek-guest
Date: 2010-10-23 15:51:10 +0000 (Sat, 23 Oct 2010)
New Revision: 490
Added:
lighttpd/trunk/debian/conf-available2/
lighttpd/trunk/debian/conf-available2/10-cml.conf
lighttpd/trunk/debian/conf-available2/10-magnet.conf
lighttpd/trunk/debian/conf-available2/10-trigger-b4-dl.conf
lighttpd/trunk/debian/conf-available2/10-webdav.conf
Removed:
lighttpd/trunk/debian/conf-available/10-cml.conf
lighttpd/trunk/debian/conf-available/10-magnet.conf
lighttpd/trunk/debian/conf-available/10-trigger-b4-dl.conf
lighttpd/trunk/debian/conf-available/10-webdav.conf
Modified:
lighttpd/trunk/debian/changelog
lighttpd/trunk/debian/lighttpd-mod-cml.install
lighttpd/trunk/debian/lighttpd-mod-magnet.install
lighttpd/trunk/debian/lighttpd-mod-trigger-b4-dl.install
lighttpd/trunk/debian/lighttpd-mod-webdav.install
lighttpd/trunk/debian/lighttpd.conf
lighttpd/trunk/debian/lighttpd.install
Log:
Move conf files from other packages to conf-available2
Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/changelog 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,6 +1,10 @@
+lighttpd (1.4.28-2) unstable; urgency=low
+
[ Olaf van der Spek ]
* Use relative instead of absolute links for conf-enabled (closes: 541645)
+ -- Olaf van der Spek <olaf at router> Sat, 23 Oct 2010 17:31:25 +0200
+
lighttpd (1.4.28-1) unstable; urgency=low
[ Olaf van der Spek ]
Deleted: lighttpd/trunk/debian/conf-available/10-cml.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-cml.conf 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/conf-available/10-cml.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,21 +0,0 @@
-## CML is a Meta language to describe the dependencies of a page
-## at one side and building a page from its fragments on the
-## other side using LUA.
-##
-## /usr/share/doc/lighttpd-doc/cml.txt
-
-server.modules += ( "mod_cml" )
-
-## the extension for file with cache information. With .cml,
-## the cache info file for index.html is index.cml
-cml.extension = ".cml"
-
-index-file.names += ( "index" + cml.extension )
-
-## the memcached used by mod_cml
-# cml.memcache-hosts = ( "127.0.0.1:11211" )
-
-## a cml file that is executed for each request
-# cml.power-magnet = "/var/www/power-magnet.cml"
-
-
Deleted: lighttpd/trunk/debian/conf-available/10-magnet.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-magnet.conf 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/conf-available/10-magnet.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,4 +0,0 @@
-# /usr/share/doc/lighttpd-doc/magnet.txt.gz
-# http://trac.lighttpd.net/trac/wiki/Docs%3AModMagnet
-
-server.modules += ( "mod_magnet" )
Deleted: lighttpd/trunk/debian/conf-available/10-trigger-b4-dl.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-trigger-b4-dl.conf 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/conf-available/10-trigger-b4-dl.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,22 +0,0 @@
-## A module to prevent deep-linking from other sites.
-##
-# /usr/share/doc/lighttpd-doc/trigger-b4-dl.html
-
-server.modules += ( "mod_trigger_b4_dl" )
-
-## guarded download URL, direct access is denied
-#trigger-before-download.download-url = "^/download/"
-
-## trigger URL to allow downloads from <download-url>
-#trigger-before-download.trigger-url = "^/trigger/"
-
-## if access to a file is denied, the user is redirected to this URL
-#trigger-before-download.deny-url = "/var/www/deny.html"
-
-## access to granted for <timeout> seconds after the trigger
-#trigger-before-download.trigger-timeout = 10
-
-## storage of trigger information. If both destinations are provided,
-## the GDBM file takes precedence.
-#trigger-before-download.gdbm-filename = "/var/www/data/trigger.db"
-#trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
Deleted: lighttpd/trunk/debian/conf-available/10-webdav.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-webdav.conf 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/conf-available/10-webdav.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,13 +0,0 @@
-## 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.
-##
-# /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"
Copied: lighttpd/trunk/debian/conf-available2/10-cml.conf (from rev 489, lighttpd/trunk/debian/conf-available/10-cml.conf)
===================================================================
--- lighttpd/trunk/debian/conf-available2/10-cml.conf (rev 0)
+++ lighttpd/trunk/debian/conf-available2/10-cml.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -0,0 +1,21 @@
+## CML is a Meta language to describe the dependencies of a page
+## at one side and building a page from its fragments on the
+## other side using LUA.
+##
+## /usr/share/doc/lighttpd-doc/cml.txt
+
+server.modules += ( "mod_cml" )
+
+## the extension for file with cache information. With .cml,
+## the cache info file for index.html is index.cml
+cml.extension = ".cml"
+
+index-file.names += ( "index" + cml.extension )
+
+## the memcached used by mod_cml
+# cml.memcache-hosts = ( "127.0.0.1:11211" )
+
+## a cml file that is executed for each request
+# cml.power-magnet = "/var/www/power-magnet.cml"
+
+
Copied: lighttpd/trunk/debian/conf-available2/10-magnet.conf (from rev 489, lighttpd/trunk/debian/conf-available/10-magnet.conf)
===================================================================
--- lighttpd/trunk/debian/conf-available2/10-magnet.conf (rev 0)
+++ lighttpd/trunk/debian/conf-available2/10-magnet.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -0,0 +1,4 @@
+# /usr/share/doc/lighttpd-doc/magnet.txt.gz
+# http://trac.lighttpd.net/trac/wiki/Docs%3AModMagnet
+
+server.modules += ( "mod_magnet" )
Copied: lighttpd/trunk/debian/conf-available2/10-trigger-b4-dl.conf (from rev 489, lighttpd/trunk/debian/conf-available/10-trigger-b4-dl.conf)
===================================================================
--- lighttpd/trunk/debian/conf-available2/10-trigger-b4-dl.conf (rev 0)
+++ lighttpd/trunk/debian/conf-available2/10-trigger-b4-dl.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -0,0 +1,22 @@
+## A module to prevent deep-linking from other sites.
+##
+# /usr/share/doc/lighttpd-doc/trigger-b4-dl.html
+
+server.modules += ( "mod_trigger_b4_dl" )
+
+## guarded download URL, direct access is denied
+#trigger-before-download.download-url = "^/download/"
+
+## trigger URL to allow downloads from <download-url>
+#trigger-before-download.trigger-url = "^/trigger/"
+
+## if access to a file is denied, the user is redirected to this URL
+#trigger-before-download.deny-url = "/var/www/deny.html"
+
+## access to granted for <timeout> seconds after the trigger
+#trigger-before-download.trigger-timeout = 10
+
+## storage of trigger information. If both destinations are provided,
+## the GDBM file takes precedence.
+#trigger-before-download.gdbm-filename = "/var/www/data/trigger.db"
+#trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
Copied: lighttpd/trunk/debian/conf-available2/10-webdav.conf (from rev 489, lighttpd/trunk/debian/conf-available/10-webdav.conf)
===================================================================
--- lighttpd/trunk/debian/conf-available2/10-webdav.conf (rev 0)
+++ lighttpd/trunk/debian/conf-available2/10-webdav.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -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.
+##
+# /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/lighttpd-mod-cml.install
===================================================================
--- lighttpd/trunk/debian/lighttpd-mod-cml.install 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/lighttpd-mod-cml.install 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/lighttpd/mod_cml.so
-debian/conf-available/10-cml.conf etc/lighttpd/conf-available
+debian/conf-available2/10-cml.conf etc/lighttpd/conf-available
Modified: lighttpd/trunk/debian/lighttpd-mod-magnet.install
===================================================================
--- lighttpd/trunk/debian/lighttpd-mod-magnet.install 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/lighttpd-mod-magnet.install 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/lighttpd/mod_magnet.so
-debian/conf-available/10-magnet.conf etc/lighttpd/conf-available
+debian/conf-available2/10-magnet.conf etc/lighttpd/conf-available
Modified: lighttpd/trunk/debian/lighttpd-mod-trigger-b4-dl.install
===================================================================
--- lighttpd/trunk/debian/lighttpd-mod-trigger-b4-dl.install 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/lighttpd-mod-trigger-b4-dl.install 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/lighttpd/mod_trigger_b4_dl.so
-debian/conf-available/10-trigger-b4-dl.conf etc/lighttpd/conf-available
+debian/conf-available2/10-trigger-b4-dl.conf etc/lighttpd/conf-available
Modified: lighttpd/trunk/debian/lighttpd-mod-webdav.install
===================================================================
--- lighttpd/trunk/debian/lighttpd-mod-webdav.install 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/lighttpd-mod-webdav.install 2010-10-23 15:51:10 UTC (rev 490)
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/lighttpd/mod_webdav.so
-debian/conf-available/10-webdav.conf /etc/lighttpd/conf-available
+debian/conf-available2/10-webdav.conf /etc/lighttpd/conf-available
Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/lighttpd.conf 2010-10-23 15:51:10 UTC (rev 490)
@@ -24,12 +24,8 @@
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-## Use ipv6 if available
include_shell "/usr/share/lighttpd/use-ipv6.pl"
-# server.port = 81
-# server.bind = "localhost"
-
dir-listing.encoding = "utf-8"
server.dir-listing = "enable"
Modified: lighttpd/trunk/debian/lighttpd.install
===================================================================
--- lighttpd/trunk/debian/lighttpd.install 2010-10-23 15:12:01 UTC (rev 489)
+++ lighttpd/trunk/debian/lighttpd.install 2010-10-23 15:51:10 UTC (rev 490)
@@ -28,21 +28,7 @@
debian/tmp/usr/lib/lighttpd/mod_userdir.so
debian/tmp/usr/lib/lighttpd/mod_usertrack.so
debian/lighttpd.conf /etc/lighttpd
-debian/conf-available/05-auth.conf /etc/lighttpd/conf-available
-debian/conf-available/10-status.conf /etc/lighttpd/conf-available
-debian/conf-available/10-accesslog.conf /etc/lighttpd/conf-available
-debian/conf-available/10-cgi.conf /etc/lighttpd/conf-available
-debian/conf-available/10-fastcgi.conf /etc/lighttpd/conf-available
-debian/conf-available/10-no-www.conf /etc/lighttpd/conf-available
-debian/conf-available/10-proxy.conf /etc/lighttpd/conf-available
-debian/conf-available/10-rrdtool.conf /etc/lighttpd/conf-available
-debian/conf-available/10-simple-vhost.conf /etc/lighttpd/conf-available
-debian/conf-available/10-ssi.conf /etc/lighttpd/conf-available
-debian/conf-available/10-ssl.conf /etc/lighttpd/conf-available
-debian/conf-available/10-userdir.conf /etc/lighttpd/conf-available
-debian/conf-available/15-fastcgi-php.conf /etc/lighttpd/conf-available
-debian/conf-available/90-debian-doc.conf /etc/lighttpd/conf-available
-debian/conf-available/README /etc/lighttpd/conf-available
+debian/conf-available/* /etc/lighttpd/conf-available
debian/create-mime.assign.pl /usr/share/lighttpd/
debian/include-conf-enabled.pl /usr/share/lighttpd/
debian/use-ipv6.pl /usr/share/lighttpd/
More information about the pkg-lighttpd-maintainers
mailing list