[munin/el6: 6/6] Merge remote-tracking branch 'origin/master' into el6

[fenris02]

commit a1be66a11e24d77a1f97f7d507a718bd731bddf7
Merge: 91d9630 4f306b1
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Apr 28 12:47:31 2013 -0500

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore                    |    1 +
 munin-2.0.12.tar.gz.sha256sum |    1 -
 munin-2.0.13.tar.gz.sha256sum |    1 +
 munin-fcgi-graph.rc           |   56 +++++++++++++++++++++++++
 munin-fcgi-graph.service      |    2 +-
 munin-fcgi-html.rc            |   56 +++++++++++++++++++++++++
 munin-fcgi-html.service       |    2 +-
 munin.spec                    |   90 ++++++++++++++++++++++++++++++++++++-----
 nginx_munin.conf              |   49 ++++++++++++++++++++++
 sources                       |    2 +-
 10 files changed, 245 insertions(+), 15 deletions(-)
---
diff --cc munin.spec
index d68fe53,44b579f..fd9d91d
--- a/munin.spec
+++ b/munin.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:           munin
++<<<<<<< HEAD
 +Version:        2.0.12
 +Release:        2%{?dist}
++=======
+ Version:        2.0.13
+ Release:        1%{?dist}
++>>>>>>> origin/master
  Summary:        Network-wide graphing framework (grapher/gatherer)
  
  Group:          System Environment/Daemons
@@@ -721,7 -759,29 +764,32 @@@ exit 
  %attr(0755,apache,apache) %dir /var/lib/munin/cgi-tmp/munin-cgi-graph
  
  
+ %files nginx
+ %defattr(-,root,root)
+ %config(noreplace) %{_sysconfdir}/nginx/conf.d/munin.conf
+ %if 0%{?rhel} > 6 || 0%{?fedora} > 15
+ /lib/systemd/system/munin-fcgi-html.service
+ /lib/systemd/system/munin-fcgi-graph.service
+ %else
+ %{_sysconfdir}/rc.d/init.d/munin-fcgi-html
+ %{_sysconfdir}/rc.d/init.d/munin-fcgi-graph
+ %endif
+ 
+ 
  %changelog
++<<<<<<< HEAD
++=======
+ * Fri Apr 26 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.13-1
+ - Upstream released 2.0.13
+ 
+ * Thu Apr 4 2013 Viljo Viitanen <viljo.viitanen at iki.fi> - 2.0.12-4
+ - BZ #905421 add nginx cgi package, removed unnecessary services from apache
+   cgi package
+ 
+ * Mon Apr 01 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.12-3
+ - Add fw_ default config
+ 
++>>>>>>> origin/master
  * Sun Mar 24 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.12-2
  - BZ# 917002 minor edits for asyncd