[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    kimheino pushed to munin (f29). "Merge remote-tracking branch 'origin/master' into el6"
From:       notifications () fedoraproject ! org
Date:       2018-08-24 19:47:22
Message-ID: 20180824194722.7C07B60C3B6A () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

Notification time stamped 2018-08-24 19:44:18 UTC

From f3c9c3dc60330bf252accc030f61dbc59def09a9 Mon Sep 17 00:00:00 2001
From: d. johnson <fenris02@fedoraproject.org>
Date: Oct 11 2016 03:24:00 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6


---

diff --git a/munin-fcgi-html.rc b/munin-fcgi-html.rc
index a5a106e..879ea4f 100644
--- a/munin-fcgi-html.rc
+++ b/munin-fcgi-html.rc
@@ -19,7 +19,7 @@ restorecon /var/run/munin 2>/dev/null
 case "$1" in
   start)
 	echo -n "Starting Munin fcgi-html: "
-        /usr/bin/spawn-fcgi -s /var/run/munin/fcgi-html.sock -U nginx -u munin -g \
munin /var/www/cgi-bin/munin-cgi-html -P /var/run/munin/fcgi-html.pid +        \
/usr/bin/spawn-fcgi -s /var/run/munin/fcgi-html.sock -u munin -g munin \
/var/www/cgi-bin/munin-cgi-html -P /var/run/munin/fcgi-html.pid  RETVAL=$?
 	if [ $RETVAL -eq 0 ]
 	then
diff --git a/munin-fcgi-html.service b/munin-fcgi-html.service
index a413eb3..3fa4640 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 nginx -u munin -g \
munin /var/www/cgi-bin/munin-cgi-html -P /run/munin/fcgi-html.pid \
+ExecStart=/usr/bin/spawn-fcgi -s /run/munin/fcgi-html.sock -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 ca0c059..d174a2f 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -868,6 +868,9 @@ exit 0
 
 
 %changelog
+* Tue Oct 11 2016 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.26-4
+- BZ# 1383219 - user nginx is not required for cgi
+
 * Mon Oct 10 2016 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.26-3
 - BZ# 1339122 - Include PR-737 to fix hddtemp_smartctl until 2.0.27 is official
 - BZ# 1383219 - user nginx is not required for cgi


	https://src.fedoraproject.org/rpms/munin/c/f3c9c3dc60330bf252accc030f61dbc59def09a9?branch=f29
 _______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/scm-commits@lists.fedoraproject.org/message/HMA7ENUFSYHX5ATBGRWC3V5IOYGGPKZQ/



[prev in list] [next in list] [prev in thread] [next in thread]