rpms/lighttpd/devel lighttpd-1.4.20-defaultconf.patch, NONE, 1.1 lighttpd-1.4.20-initinfo.patch, NONE, 1.1 lighttpd.spec, 1.48, 1.49 lighttpd-1.4.17-defaultconf.patch, 1.2, NONE
Matthias Saou
thias at fedoraproject.org
Mon Dec 22 16:14:18 UTC 2008
Author: thias
Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15154
Modified Files:
lighttpd.spec
Added Files:
lighttpd-1.4.20-defaultconf.patch
lighttpd-1.4.20-initinfo.patch
Removed Files:
lighttpd-1.4.17-defaultconf.patch
Log Message:
* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-2
- Include conf.d/*.conf configuration snippets (#444953).
- Mark the default index.html in order to not loose changes upon upgrade if it
was edited or replaced with a different file (#438564).
- Include patch to add the INIT INFO block to the init script (#246973).
lighttpd-1.4.20-defaultconf.patch:
--- NEW FILE lighttpd-1.4.20-defaultconf.patch ---
diff -Naupr lighttpd-1.4.20.orig/doc/lighttpd.conf lighttpd-1.4.20/doc/lighttpd.conf
--- lighttpd-1.4.20.orig/doc/lighttpd.conf 2008-09-23 21:05:42.000000000 +0200
+++ lighttpd-1.4.20/doc/lighttpd.conf 2008-12-22 16:41:52.526309388 +0100
@@ -37,7 +37,7 @@ server.modules = (
## a static document-root, for virtual-hosting take look at the
## server.virtual-* options
-server.document-root = "/srv/www/htdocs/"
+server.document-root = "/var/www/lighttpd/"
## where to send error-messages to
server.errorlog = "/var/log/lighttpd/error.log"
@@ -51,6 +51,7 @@ index-file.names = ( "index.p
# mimetype mapping
mimetype.assign = (
+ ".rpm" => "application/x-rpm",
".pdf" => "application/pdf",
".sig" => "application/pgp-signature",
".spl" => "application/futuresplash",
@@ -148,7 +149,7 @@ static-file.exclude-extensions = ( ".php
#server.error-handler-404 = "/error-handler.php"
## to help the rc.scripts
-#server.pid-file = "/var/run/lighttpd.pid"
+server.pid-file = "/var/run/lighttpd.pid"
###### virtual hosts
@@ -189,10 +190,10 @@ static-file.exclude-extensions = ( ".php
#server.chroot = "/"
## change uid to <uid> (default: don't care)
-#server.username = "wwwrun"
+server.username = "lighttpd"
## change uid to <uid> (default: don't care)
-#server.groupname = "wwwrun"
+server.groupname = "lighttpd"
#### compress module
#compress.cache-dir = "/var/cache/lighttpd/compress/"
@@ -216,7 +217,7 @@ static-file.exclude-extensions = ( ".php
# ( "localhost" =>
# (
# "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-# "bin-path" => "/usr/local/bin/php-cgi"
+# "bin-path" => "/usr/bin/php-cgi"
# )
# )
# )
@@ -326,3 +327,7 @@ static-file.exclude-extensions = ( ".php
#include_shell "echo var.a=1"
## the above is same as:
#var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+
lighttpd-1.4.20-initinfo.patch:
--- NEW FILE lighttpd-1.4.20-initinfo.patch ---
diff -Naupr lighttpd-1.4.20.orig/doc/rc.lighttpd.redhat lighttpd-1.4.20/doc/rc.lighttpd.redhat
--- lighttpd-1.4.20.orig/doc/rc.lighttpd.redhat 2006-10-04 15:26:23.000000000 +0200
+++ lighttpd-1.4.20/doc/rc.lighttpd.redhat 2008-12-22 16:59:12.767381943 +0100
@@ -14,6 +14,14 @@
# by lighttpd (config: server.pid-file).
# If not, uncomment 'pidof' line.
+### BEGIN INIT INFO
+# Provides: httpd
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop Lighttpd HTTP Server
+# Description: Lightning fast webserver with light system requirements.
+### END INIT INFO
+
# Source function library
. /etc/rc.d/init.d/functions
Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- lighttpd.spec 13 Oct 2008 14:48:29 -0000 1.48
+++ lighttpd.spec 22 Dec 2008 16:13:47 -0000 1.49
@@ -3,7 +3,7 @@
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
Version: 1.4.20
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.lighttpd.net/
@@ -16,8 +16,9 @@
Source13: http://www.lighttpd.net/light_logo.png
Source100: lighttpd-mod_geoip.c
Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.17-defaultconf.patch
+Patch0: lighttpd-1.4.20-defaultconf.patch
Patch1: lighttpd-1.4.18-mod_geoip.patch
+Patch2: lighttpd-1.4.20-initinfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: system-logos >= 7.92.1
Requires(pre): /usr/sbin/useradd
@@ -119,6 +120,7 @@
# Install (*patched above*) sample config file
%{__install} -D -p -m 0640 doc/lighttpd.conf \
%{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/lighttpd/conf.d
# Install our own logrotate entry
%{__install} -D -p -m 0644 %{SOURCE1} \
@@ -172,6 +174,7 @@
%doc AUTHORS ChangeLog COPYING README
%doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user
%dir %{_sysconfdir}/lighttpd/
+%dir %{_sysconfdir}/lighttpd/conf.d/
%config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
%config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
@@ -186,7 +189,11 @@
%{_mandir}/man1/lighttpd.1*
%attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
-%{webroot}/
+%dir %{webroot}/
+%{webroot}/*.ico
+%{webroot}/*.png
+# This is not really configuration, but prevent loss of local changes
+%config %{webroot}/index.html
%files fastcgi
%defattr(-,root,root,-)
@@ -211,6 +218,12 @@
%changelog
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-2
+- Include conf.d/*.conf configuration snippets (#444953).
+- Mark the default index.html in order to not loose changes upon upgrade if it
+ was edited or replaced with a different file (#438564).
+- Include patch to add the INIT INFO block to the init script (#246973).
+
* Mon Oct 13 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-1
- Update to 1.4.20 final.
--- lighttpd-1.4.17-defaultconf.patch DELETED ---
More information about the fedora-extras-commits
mailing list