- put nagios addon to nagios-cgi-nagiostats pkg

Changed files:
    cacti-template-nagiostats.spec -> 1.6

diff --git a/cacti-template-nagiostats.spec b/cacti-template-nagiostats.spec
index e8eb821fee3e0df6ee2af07620c2a619143d0f79..b7764f1c56e17d5d43eb784069d3342ebffba68b 100644 (file)
--- 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} <<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
 
@@ -65,5 +79,6 @@ rm -rf $RPM_BUILD_ROOT
 %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