munin-2.0.17-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8000 ec354946-7b23-47d6-9f5a-488ba84defc7

m/munin/munin-vl.spec

@@ -1,5 +1,5 @@
 Name:      munin
-Version:   2.0.8
+Version:   2.0.17
 Release:   1%{?_dist_release}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
@@ -24,10 +24,18 @@ Source17: munin.cron.d
 Source18: munin-node.rc
 Source19: httpd_munin-cgi.conf
 
-Patch4:         munin-2.0.4-Utils-cluck.patch
+Source100: munin-cgi-graph.init
-Patch5:         acpi-2.0.5.patch
+Source101: munin-cgi-html.init
-Patch7:         munin-2.0-defect-1213.patch
+Source102: munin-cgi-graph.sysconfig
-Patch9:         munin-2.0.8-cgitmp.patch
+Source103: munin-cgi-html.sysconfig
+Source104: munin_params
+
+Patch4:    munin-2.0.4-Utils-cluck.patch
+Patch5:    acpi-2.0.5.patch
+Patch7:    munin-2.0-defect-1213.patch
+Patch9:    munin-2.0.8-cgitmp.patch
+
+Patch100:  munin-cgi-taint.patch
 
 BuildArchitectures: noarch
 
@@ -138,11 +146,11 @@ and node (munin-node) packages.
 
 %package cgi
 Group:          System Environment/Daemons
-Summary:        Network-wide graphing framework (common files)
+Summary:        Network-wide graphing framework (cgi files)
 BuildArch:      noarch
 Requires:       %{name}-common = %{version}
-Requires:       mod_fcgid
 Requires:       spawn-fcgi
+Requires:       perl-FCGI
 
 %description cgi
 Munin package uses cron by default.  This package contains the CGI
@@ -150,7 +158,22 @@ files that can generate HTML and graphs dynamically. This enables
 munin to scale better for a master with many nodes.
 
 See documentation for setup instructions:
-http://munin-monitoring.org/wiki/CgiHowto2
+http://munin-monitoring.org/wiki/MuninConfigurationMasterCGI
+
+
+%package cgi-apache2
+Group:          System Environment/Daemons
+Summary:        Network-wide graphing framework (configuration for apache)
+BuildArch:      noarch
+Requires:       %{name}-cgi = %{version}
+Requires:       mod_fcgid-apache2
+
+%description cgi-apache2
+ This package contains a configuration file for apache2 to generate
+HTML and graph files dynamically.
+
+See documentation for setup instructions:
+http://munin-monitoring.org/wiki/MuninConfigurationMasterCGI
 
 QUICK-HOWTO:
 sed -i 's/\(.*\)_strategy.*/\1_strategy cgi/' /etc/munin/munin.conf
@@ -159,7 +182,22 @@ for svc in apache2 munin-node spawn-fcgi; do
   chkconfig $svc on
   service $svc start
 done
-    
+
+
+%package cgi-nginx
+Group:          System Environment/Daemons
+Summary:        Network-wide graphing framework (for nginx)
+BuildArch:      noarch
+Requires:       %{name}-cgi = %{version}
+Requires:       nginx
+
+%description cgi-nginx
+ This package contains a configuration file for nginx to generate
+HTML and graph files dynamically.
+
+See documentation for setup instructions:
+http://munin-monitoring.org/wiki/MuninConfigurationMasterCGI
+
 
 %prep
 %setup -q
@@ -195,6 +233,8 @@ install -c %{SOURCE12} ./plugins/node.d.linux/cpuspeed.in
 %patch7 -p1
 %patch9 -p1
 
+%patch100 -p1
+
 install -c %{SOURCE13} ./resources/
 
 %build
@@ -318,6 +358,16 @@ do
   ln -sf %{_datadir}/munin/$i %{buildroot}%{_sbindir}/$i
 done
 
+install -m 755 %{SOURCE100} %{buildroot}%{_initdir}/munin-cgi-graph
+install -m 755 %{SOURCE101} %{buildroot}%{_initdir}/munin-cgi-html
+install -m 644 %{SOURCE102} %{buildroot}%{_sysconfdir}/sysconfig/munin-cgi-graph
+install -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/sysconfig/munin-cgi-html
+
+install -d %{buildroot}%{_sysconfdir}/nginx
+install -m 644 %{SOURCE104} %{buildroot}%{_sysconfdir}/nginx/munin_params
+
+install -d %{buildroot}%{_localstatedir}/lib/%{name}/cgi-tmp
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -463,11 +513,26 @@ exit 0
 %defattr(-,root,root)
 %attr(0755,root,munin) /var/www/cgi-bin/munin-cgi-graph
 %attr(0755,root,munin) /var/www/cgi-bin/munin-cgi-html
-%config(noreplace) %{_sysconfdir}/sysconfig/spawn-fcgi-munin
+%attr(0755,www-data,www-data) %dir %{_localstatedir}/lib/%{name}/cgi-tmp
+%{_initdir}/munin-cgi-graph
+%{_initdir}/munin-cgi-html
+%config(noreplace) %{_sysconfdir}/sysconfig/munin-cgi-graph
+%config(noreplace) %{_sysconfdir}/sysconfig/munin-cgi-html
+
+%files cgi-apache2
+%defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/apache2/conf.d/munin-cgi.conf
 
+%files cgi-nginx
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/nginx/munin_params
+
 
 %changelog
+* Sat Nov 23 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.17-1
+- new upstream release.
+- added sub packages "cgi-apache2" and "cgi-nginx".
+
 * Tue Dec 04 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.8-1
 - update to munin-2.0.8
 - add async/cgi sub package
@@ -504,7 +569,7 @@ exit 0
 * Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.4.6-2
 - Perl mass rebuild
 
-* Wed Jul  8 2011 D. Johnson <fenris02@fedoraproject.org> - 1.4.6-1
+* Fri Jul  8 2011 D. Johnson <fenris02@fedoraproject.org> - 1.4.6-1
 - update to 1.4.6
 
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.5-13