X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cacti-template-nagiostats.spec;h=b7764f1c56e17d5d43eb784069d3342ebffba68b;hb=094b9a01058294d0f6bc124f95caab199c752814;hp=fa434ff15da7a05450fdcaf30a62fc13223ecd53;hpb=7dc81ccae4626d88e5eeaae7d1cc97c18ab6daac;p=packages%2Fcacti-template-nagiostats.git

diff --git a/cacti-template-nagiostats.spec b/cacti-template-nagiostats.spec
index fa434ff..b7764f1 100644
--- a/cacti-template-nagiostats.spec
+++ b/cacti-template-nagiostats.spec
@@ -1,22 +1,26 @@
 # 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.5
+Release:	0.13
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://forums.cacti.net/download/file.php?id=18185#/nacti.tar.gz
 # Source0-md5:	758d07f15a58c845169b3359bce837c5
 Source1:	cacti_host_template_nagios_statistics.xml
+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)
 
@@ -29,17 +33,27 @@ 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
+%patch1 -p1
 cp -a %{SOURCE1} .
+cp -a %{SOURCE2} .
+%{__sed} -i -e 's,check_nagios.pl,check_nagios.sh,' *
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{resourcedir},%{scriptsdir},%{nagioscgidir}}
-install -p check_nagios.pl $RPM_BUILD_ROOT%{scriptsdir}
+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
@@ -51,14 +65,20 @@ 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} <<EOF
+You should install 'nagios-cgi-nagiostats' to Nagios servier which would be used
+to provide data for Cacti template.
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{scriptsdir}/check_nagios.pl
+%attr(755,root,root) %{scriptsdir}/check_nagios.sh
 %{resourcedir}/*.xml
 
-# nagios-cacti-nagiostats
+%files -n nagios-cgi-nagiostats
+%defattr(644,root,root,755)
 %attr(755,root,root) %{nagioscgidir}/mrtgstats.cgi