Author: glen Date: Mon Jul 17 17:25:42 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - lighttpd support
---- Files affected: SPECS: nagios.spec (1.83 -> 1.84) ---- Diffs: ================================================================ Index: SPECS/nagios.spec diff -u SPECS/nagios.spec:1.83 SPECS/nagios.spec:1.84 --- SPECS/nagios.spec:1.83 Fri Jul 14 09:00:10 2006 +++ SPECS/nagios.spec Mon Jul 17 19:25:37 2006 @@ -7,7 +7,7 @@ Summary(pt_BR): Programa para monitoraçăo de máquinas e serviços Name: nagios Version: 2.5 -Release: 1 +Release: 1.6 License: GPL v2 Group: Networking Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz @@ -19,6 +19,7 @@ # Source4-md5: 1c4201c7da53d6c7e48251d3a9680449 Source5: %{name}-config-20050514.tar.bz2 # Source5-md5: a2883c65377ef7beb55d48af85ec7ef7 +Source6: %{name}-lighttpd.conf Patch0: %{name}-resources.patch Patch1: %{name}-iconv-in-libc.patch Patch2: %{name}-favicon.patch @@ -120,12 +121,13 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-imagepaks Requires: %{name}-theme -Requires: apache(mod_alias) -Requires: apache(mod_auth) -Requires: apache(mod_cgi) Requires: group(http) Requires: webapps -Requires: webserver = apache +Requires: webserver +Requires: webserver(alias) +Requires: webserver(auth) +Requires: webserver(cgi) +Requires: webserver(indexfile) %description cgi CGI webinterface for Nagios. @@ -179,6 +181,7 @@ ' $(find contrib/eventhandlers -type f) sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE1} > apache.conf +sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE6} > lighttpd.conf %build cp -f /usr/share/automake/config.sub . @@ -221,6 +224,7 @@ # webserver files install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf +install lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf mv $RPM_BUILD_ROOT{%{_sysconfdir}/cgi.cfg,%{_webapps}/%{_webapp}} > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group @@ -295,6 +299,13 @@ %triggerun cgi -- apache < 2.2.0, apache-base %webapp_unregister httpd %{_webapp} +%triggerin cgi -- lighttpd +%addusertogroup lighttpd nagios-data +%webapp_register lighttpd %{_webapp} + +%triggerun cgi -- lighttpd +%webapp_unregister lighttpd %{_webapp} + %triggerpostun -- nagios-cgi < 2.0-0.b3.21 chown root:http %{_sysconfdir}/cgi.cfg @@ -433,6 +444,7 @@ %dir %attr(750,root,http) %{_webapps}/%{_webapp} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/lighttpd.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/cgi.cfg %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/passwd %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/group @@ -466,6 +478,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.84 2006/07/17 17:25:37 glen +- lighttpd support + Revision 1.83 2006/07/14 07:00:10 shadzik - up to 2.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.83&r2=1.84&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
