[munin] Minor CGI fixes

[fenris02]

commit e25ac1ba41ead95ea06ba120ba372ef940574f4b
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Nov 4 16:24:40 2012 -0600

    Minor CGI fixes

 munin-fcgi-graph.service |    2 +-
 munin-fcgi-html.service  |    2 +-
 munin.spec               |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/munin-fcgi-graph.service b/munin-fcgi-graph.service
index ced107d..0a42285 100644
--- a/munin-fcgi-graph.service
+++ b/munin-fcgi-graph.service
@@ -5,7 +5,7 @@ Documentation=man:spawn-fcgi
 [Service]
 Type=forking
 PIDFile=/run/munin/fcgi-graph.pid
-ExecStart=/usr/bin/spawn-fcgi -s /run/munin/fcgi-graph.sock -U apache -u munin -g munin /var/www/html/munin/cgi/munin-cgi-graph -P /run/munin/fcgi-graph.pid
+ExecStart=/usr/bin/spawn-fcgi -s /run/munin/fcgi-graph.sock -U apache -u munin -g munin /var/www/cgi-bin/munin-cgi-graph -P /run/munin/fcgi-graph.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/munin-fcgi-html.service b/munin-fcgi-html.service
index 735ca4c..80cee4e 100644
--- a/munin-fcgi-html.service
+++ b/munin-fcgi-html.service
@@ -5,7 +5,7 @@ Documentation=man:spawn-fcgi
 [Service]
 Type=forking
 PIDFile=/run/munin/fcgi-html.pid
-ExecStart=/usr/bin/spawn-fcgi -s /run/munin/fcgi-html.sock -U apache -u munin -g munin /var/www/html/munin/cgi/munin-cgi-html -P /run/munin/fcgi-html.pid
+ExecStart=/usr/bin/spawn-fcgi -s /run/munin/fcgi-html.sock -U apache -u munin -g munin /var/www/cgi-bin/munin-cgi-html -P /run/munin/fcgi-html.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/munin.spec b/munin.spec
index a60a277..d835a69 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -558,7 +558,7 @@ exit 0
 %dir %{_datadir}/munin
 %dir %attr(-,munin,munin) /var/lib/munin
 %dir %attr(0775,nobody,munin) /var/lib/munin-node/plugin-state
-%dir %attr(-,munin,munin) /var/log/munin
+%dir %attr(0775,apache,munin) /var/log/munin
 %config(noreplace) %{_sysconfdir}/logrotate.d/munin-node
 %config(noreplace) %{_sysconfdir}/munin/munin-node.conf
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/df
@@ -620,6 +620,9 @@ exit 0
 
 
 %changelog
+* Sun Nov 04 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.7-6
+- minor CGI permission fixes
+
 * Sun Nov 04 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.7-5
 - BZ# 872891 Re-add config file option to use conf.d/ instead of munin-conf.d/