Author: glen Date: Sun Jan 8 15:44:36 2012 GMT Module: packages Tag: HEAD ---- Log message: - nagios cgi.cfg is in webapps dir
---- Files affected: packages/nagios-bp: nagios-bp.spec (1.1 -> 1.2) , paths.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nagios-bp/nagios-bp.spec diff -u packages/nagios-bp/nagios-bp.spec:1.1 packages/nagios-bp/nagios-bp.spec:1.2 --- packages/nagios-bp/nagios-bp.spec:1.1 Sun Jan 8 15:41:10 2012 +++ packages/nagios-bp/nagios-bp.spec Sun Jan 8 16:44:31 2012 @@ -3,12 +3,13 @@ Summary: Nagios Business Process AddOns Name: nagios-bp Version: 0.9.6 -Release: 0.5 +Release: 0.6 License: GPL v2 Group: Applications/WWW Source0: http://bp-addon.monitoringexchange.org/download/nagios-business-process-addon-%{version}.tar.gz # Source0-md5: 8b88a1729f6c6324e410a285e1a493fd Patch0: DESTDIR.patch +Patch1: paths.patch URL: http://bp-addon.monitoringexchange.org/ BuildRequires: rpm-perlprov >= 4.1-13 Requires: nagios-cgi @@ -42,6 +43,7 @@ %prep %setup -q -n nagios-business-process-addon-%{version} %patch0 -p1 +%patch1 -p1 %build %configure \ @@ -90,8 +92,8 @@ %defattr(644,root,root,755) %doc API-DOC AUTHORS CHANGES INSTALL README UPDATE %dir %attr(750,root,http) %{_sysconfdir} -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.cfg -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.cfg +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/nagiosbp %attr(755,root,root) %{cgidir}/nagios-bp.cgi @@ -120,5 +122,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2012/01/08 15:44:31 glen +- nagios cgi.cfg is in webapps dir + Revision 1.1 2012/01/08 14:41:10 glen - new, not tested ================================================================ Index: packages/nagios-bp/paths.patch diff -u /dev/null packages/nagios-bp/paths.patch:1.1 --- /dev/null Sun Jan 8 16:44:37 2012 +++ packages/nagios-bp/paths.patch Sun Jan 8 16:44:31 2012 @@ -0,0 +1,11 @@ +--- nagios-business-process-addon-0.9.6/./sbin/nagios-bp.cgi.in~ 2010-09-29 19:56:10.000000000 +0300 ++++ nagios-business-process-addon-0.9.6/./sbin/nagios-bp.cgi.in 2012-01-08 17:42:50.327392962 +0200 +@@ -55,7 +55,7 @@ + my $rowcount = 0; + my $session_dir = $settings->{'NAGIOSBP_VAR'} . "/nagios_bp.sessions"; + my $new_session = 0; +- my $cgi_cfg_file = $settings->{'NAGIOS_ETC'} . "/cgi.cfg"; ++ my $cgi_cfg_file = "/etc/webapps/nagios/cgi.cfg"; + my $default_language = "de"; + my $cgi_simple = new CGI::Simple; #Instance of CGI simple + my $query = new CGI; #Instance of CGI module ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-bp/nagios-bp.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
