packages: mailgraph/mailgraph.spec, mailgraph/lighttpd.conf (NEW) - lighttp...

[glen]

Author: glen                         Date: Tue Jul 13 14:07:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- lighttpd support

---- Files affected:
packages/mailgraph:
   mailgraph.spec (1.53 -> 1.54) , lighttpd.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mailgraph/mailgraph.spec
diff -u packages/mailgraph/mailgraph.spec:1.53 packages/mailgraph/mailgraph.spec:1.54
--- packages/mailgraph/mailgraph.spec:1.53	Tue Jul 13 15:55:47 2010
+++ packages/mailgraph/mailgraph.spec	Tue Jul 13 16:07:16 2010
@@ -1,12 +1,10 @@
 # $Revision$, $Date$
-# TODO:
-# - lighttpd support
 %include	/usr/lib/rpm/macros.perl
 Summary:	Simple mail statistics for Postfix
 Summary(pl.UTF-8):	Proste statystyki dla Postfiksa
 Name:		mailgraph
 Version:	1.14
-Release:	2.3
+Release:	2.7
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	http://mailgraph.schweikert.ch/pub/%{name}-%{version}.tar.gz
@@ -14,6 +12,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.conf
+Source4:	lighttpd.conf
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-postfix_rbl.patch
 Patch2:		clamd-enable.patch
@@ -48,10 +47,10 @@
 Summary:	CGI script for displaying mailgraph rrd data
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
-Requires:	apache(mod_cgi)
-Requires:	apache(mod_expires)
 Requires:	webapps
 Requires:	webserver
+Requires:	webserver(cgi)
+Requires:	webserver(expires)
 
 %description cgi
 CGI script for displaying mailgraph rrd data.
@@ -75,11 +74,14 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a mailgraph.1 $RPM_BUILD_ROOT%{_mandir}/man1
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mailgraph
+touch $RPM_BUILD_ROOT/var/log/mailgraph.log
+
+# cgi app
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 cp -a mailgraph.css $RPM_BUILD_ROOT%{_sysconfdir}/mailgraph.css
 ln -sf %{_sysconfdir}/mailgraph.css $RPM_BUILD_ROOT%{_appdir}/mailgraph.css
-touch $RPM_BUILD_ROOT/var/log/mailgraph.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,6 +112,12 @@
 %triggerun cgi -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
+%triggerin cgi -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun cgi -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+
 %triggerpostun -- %{name} < 1.14-2.1
 chown http:http %{_pkglibdir}/*.rrd
 
@@ -128,6 +136,7 @@
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mailgraph.css
 %dir %{_appdir}
 %attr(755,root,root) %{_appdir}/index.cgi
@@ -140,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2010/07/13 14:07:16  glen
+- lighttpd support
+
 Revision 1.53  2010/07/13 13:55:47  glen
 - move cgi to -cgi subpackage, main contains just collecting daemon
 - switch to http user, drop hacking http user groups

================================================================
Index: packages/mailgraph/lighttpd.conf
diff -u /dev/null packages/mailgraph/lighttpd.conf:1.1
--- /dev/null	Tue Jul 13 16:07:24 2010
+++ packages/mailgraph/lighttpd.conf	Tue Jul 13 16:07:16 2010
@@ -0,0 +1,5 @@
+# $Id$
+
+alias.url += (
+    "/mailgraph" => "/usr/lib/cgi-bin/mailgraph",
+)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mailgraph/mailgraph.spec?r1=1.53&r2=1.54&f=u