From 094b9a01058294d0f6bc124f95caab199c752814 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 13 Dec 2010 22:00:17 +0000 Subject: [PATCH] - put nagios addon to nagios-cgi-nagiostats pkg Changed files: cacti-template-nagiostats.spec -> 1.6 --- cacti-template-nagiostats.spec | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/cacti-template-nagiostats.spec b/cacti-template-nagiostats.spec index e8eb821..b7764f1 100644 --- a/cacti-template-nagiostats.spec +++ b/cacti-template-nagiostats.spec @@ -1,10 +1,12 @@ # TODO -# - package for nagios cgi only to support remote installs +# - Data Sources (data_sources.php) get duplicated if you use host template, +# this is limitation of cacti, but you can manually join the DS with graphs +# and delete overkill. %define template nagiostats Summary: Nagios Statistics - Cacti scripts and templates Name: cacti-template-%{template} Version: 0.1 -Release: 0.7 +Release: 0.13 License: GPL v2 Group: Applications/WWW Source0: http://forums.cacti.net/download/file.php?id=18185#/nacti.tar.gz @@ -14,11 +16,11 @@ Source2: check_nagios.sh Patch0: pld.patch Patch1: cgi-rfc.patch URL: http://forums.cacti.net/about33806.html -BuildRequires: rpmbuild(macros) >= 1.554 +BuildRequires: rpmbuild(macros) >= 1.595 BuildRequires: sed >= 4.0 Requires: cacti >= 0.8.7e-8 -# nagios-cacti-nagiostats -Requires: nagios-cgi +Requires: wget +Suggests: nagios-cgi-nagiostats BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,6 +33,14 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Template for Cacti - Nagios statistics. +%package -n nagios-cgi-nagiostats +Summary: CGI webinterface for Nagiostats +Group: Applications/WWW +Requires: nagios-cgi + +%description -n nagios-cgi-nagiostats +CGI webinterface for Nagiostats. + %prep %setup -qc %patch0 -p1 @@ -44,7 +54,6 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{resourcedir},%{scriptsdir},%{nagioscgidir}} install -p check_nagios.sh $RPM_BUILD_ROOT%{scriptsdir} install -p mrtgstats.cgi $RPM_BUILD_ROOT%{nagioscgidir} - cp -a *.xml $RPM_BUILD_ROOT%{resourcedir} %post @@ -56,6 +65,11 @@ cp -a *.xml $RPM_BUILD_ROOT%{resourcedir} %cacti_import_template %{resourcedir}/cacti_graph_template_nagios_statistics_-_service_problems.xml %cacti_import_template %{resourcedir}/cacti_host_template_nagios_statistics.xml +%banner -o -e %{name} <