[prev in list] [next in list] [prev in thread] [next in thread]
List: fedora-extras-commits
Subject: kimheino pushed to munin (f28). "Merge remote-tracking branch 'origin/master' into el6"
From: notifications () fedoraproject ! org
Date: 2018-08-24 19:48:05
Message-ID: 20180824194805.8A6AC62C4E83 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]
Notification time stamped 2018-08-24 19:44:35 UTC
From d96d2da4c69b77fde02386c2346b638a796c9a5e Mon Sep 17 00:00:00 2001
From: D. Johnson <fenris02@fedoraproject.org>
Date: Dec 08 2012 17:42:57 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6
---
diff --git a/.gitignore b/.gitignore
index 14a8fb8..ac99075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/munin-2.0.6.tar.gz
/munin-2.0.7.tar.gz
/munin-2.0.8.tar.gz
+/munin-2.0.9.tar.gz
diff --git a/httpd_munin-cgi.conf b/httpd_munin-cgi.conf
index e7cf8eb..3f74e0c 100644
--- a/httpd_munin-cgi.conf
+++ b/httpd_munin-cgi.conf
@@ -1,45 +1,48 @@
-Alias /static /var/www/html/munin/static
-
-# Rewrites
-RewriteEngine On
-
-# HTML
-RewriteCond %{REQUEST_URI} !^/static
-RewriteCond %{REQUEST_URI} .html$ [or]
-RewriteCond %{REQUEST_URI} =/
-RewriteRule ^/(.*) /var/www/cgi-bin/munin-cgi-html/$1 [L]
-
-# Images
-
-# - remove path to munin-cgi-graph, if present
-RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /$1
-
-RewriteCond %{REQUEST_URI} !^/static
-RewriteCond %{REQUEST_URI} .png$
-RewriteRule ^/(.*) /var/www/cgi-bin/munin-cgi-graph/$1 [L]
-
-# Ensure we can run (fast)cgi scripts
-ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph
-<Location /munin-cgi/munin-cgi-graph>
- Options +ExecCGI
- <IfModule mod_fcgid.c>
- SetHandler fcgid-script
- </IfModule>
- <IfModule !mod_fcgid.c>
- SetHandler cgi-script
- </IfModule>
- Allow from all
-</Location>
-
-ScriptAlias /munin-cgi/munin-cgi-html /var/www/cgi-bin/munin-cgi-html
-<Location /munin-cgi/munin-cgi-html>
- Options +ExecCGI
- <IfModule mod_fcgid.c>
- SetHandler fcgid-script
- </IfModule>
- <IfModule !mod_fcgid.c>
- SetHandler cgi-script
- </IfModule>
- Allow from all
-</Location>
+# http://munin.readthedocs.org/en/latest/example/webserver/apache-virtualhost.html
+<VirtualHost *:80>
+ #ServerName munin.example.org
+ #ServerAlias munin
+ #ServerAdmin info@example.org
+
+ DocumentRoot /var/www/html/munin
+
+ ErrorLog /var/log/httpd/munin.example.org-error.log
+ CustomLog /var/log/httpd/munin.example.org-access.log combined
+
+ # Rewrites
+ RewriteEngine On
+
+ # Static content in /static
+ RewriteRule ^/favicon.ico /var/www/html/munin/static/favicon.ico [L]
+ RewriteRule ^/static/(.*) /var/www/html/munin/static/$1 [L]
+
+ # workaround for some static content
+ RewriteRule /favicon.ico /var/www/html/munin/static/favicon.ico [L]
+ RewriteRule /static/style-new.css /var/www/html/munin/static/style-new.css [L]
+
+ # HTML
+ RewriteCond %{REQUEST_URI} .html$ [or]
+ RewriteCond %{REQUEST_URI} =/
+ RewriteRule ^/(.*) /var/www/cgi-bin/munin-cgi-html/$1 [L]
+
+ # Images
+ # - remove path to munin-cgi-graph, if present
+ RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /$1
+
+ RewriteCond %{REQUEST_URI} .png$
+ RewriteRule ^/(.*) /var/www/cgi-bin/munin-cgi-graph/$1 [L]
+
+ ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph
+
+ # Ensure we can run (fast)cgi scripts
+ <Directory "/var/www/cgi-bin">
+ Options +ExecCGI
+ <IfModule mod_fcgid.c>
+ SetHandler fcgid-script
+ </IfModule>
+ <IfModule !mod_fcgid.c>
+ SetHandler cgi-script
+ </IfModule>
+ </Directory>
+</VirtualHost>
diff --git a/munin-2.0.8.tar.gz.sha256sum b/munin-2.0.8.tar.gz.sha256sum
deleted file mode 100644
index 5cd1c97..0000000
--- a/munin-2.0.8.tar.gz.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-ae645daee35214c1ba3d771d990fa781df741751b7b79e9d9fe48c583890dca6 munin-2.0.8.tar.gz
diff --git a/munin-2.0.9.tar.gz.sha256sum b/munin-2.0.9.tar.gz.sha256sum
new file mode 100644
index 0000000..52ab9fd
--- /dev/null
+++ b/munin-2.0.9.tar.gz.sha256sum
@@ -0,0 +1 @@
+6bb2b42de29a438ad80f1d6c53f4a35e9a74cb5a2103ea7a9530cba2d75c7309 munin-2.0.9.tar.gz
diff --git a/munin-node.logrotate b/munin-node.logrotate
index 05e8105..8d176ea 100644
--- a/munin-node.logrotate
+++ b/munin-node.logrotate
@@ -5,5 +5,6 @@
compress
copytruncate
notifempty
- create 644 munin munin
+ create 644 root root
+ su root root
}
diff --git a/munin.logrotate b/munin.logrotate
index 9ebece4..11abd53 100644
--- a/munin.logrotate
+++ b/munin.logrotate
@@ -1,35 +1,39 @@
/var/log/munin/munin-update.log {
- daily
- missingok
- rotate 7
- compress
- notifempty
- create 640 munin adm
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ create 640 munin munin
+ su munin munin
}
/var/log/munin/munin-graph.log {
- daily
- missingok
- rotate 7
- compress
- notifempty
- create 640 munin adm
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ create 640 munin munin
+ su munin munin
}
/var/log/munin/munin-html.log {
- daily
- missingok
- rotate 7
- compress
- notifempty
- create 640 munin adm
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ create 640 munin munin
+ su munin munin
}
/var/log/munin/munin-limits.log {
- daily
- missingok
- rotate 7
- compress
- notifempty
- create 640 munin adm
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ create 640 munin munin
+ su munin munin
}
diff --git a/munin.spec b/munin.spec
index 7c254f4..fe6466f 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,5 +1,5 @@
Name: munin
-Version: 2.0.8
+Version: 2.0.9
Release: 2%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
@@ -55,6 +55,7 @@ BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Time::HiRes)
BuildRequires: perl(Net::SSLeay)
BuildRequires: perl(HTML::Template)
+BuildRequires: perl(LWP::UserAgent)
# RHEL6+ BuildRequires: perl(Log::Log4perl) >= 1.18
%if 0%{?rhel} > 5 || 0%{?fedora} > 11
BuildRequires: perl(Log::Log4perl) >= 1.18
@@ -142,6 +143,7 @@ Requires: perl-Net-Server
Requires: perl-Net-CIDR
Requires: procps >= 2.0.7
Requires: sysstat, /usr/bin/which, hdparm
+Requires: perl(LWP::UserAgent)
Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
@@ -225,11 +227,13 @@ for a master with many nodes.
See documentation for setup instructions:
http://munin-monitoring.org/wiki/CgiHowto2
+http://munin.readthedocs.org/en/latest/example/webserver/apache-virtualhost.html
QUICK-HOWTO:
sed -i 's/\(.*\)_strategy.*/\1_strategy cgi/' /etc/munin/munin.conf
-cp --backup /etc/sysconfig/spawn-fcgi-munin /etc/sysconfig/spawn-fcgi
-for svc in httpd munin-node spawn-fcgi; do
+htpasswd -bc /etc/munin/munin-htpasswd MUNIN_WEB_USER PASSWORD
+for svc in httpd munin-node ; do
+ service $svc stop
chkconfig $svc on
service $svc start
done
@@ -374,6 +378,11 @@ install -m 0644 %{SOURCE2} \
%{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl # install logrotate scripts
install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
+%if ! 0%{?fedora} > 15 || 0%{?rhel} > 6
+# Fedora >= 16 requires 'su' directive.
+sed -i 's/su /#su /' %{buildroot}/etc/logrotate.d/munin-node
+sed -i 's/su /#su /' %{buildroot}/etc/logrotate.d/munin
+%endif
# install config for postfix under fedora
install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
@@ -403,20 +412,33 @@ mkdir -p %{buildroot}/var/lib/munin-node/plugin-state
# Create for BZ 786030
touch %{buildroot}/var/lib/munin/plugin-state/yum.state
+# Create CGI tmpdir space
+mkdir -p %{buildroot}/var/lib/munin/cgi-tmp/munin-cgi-graph
+
# Fix config file so that it no longer references the build host
sed -i 's/^\[.*/\[localhost\]/' %{buildroot}/etc/munin/munin.conf
# Create sample fcgi config files
mkdir -p %{buildroot}/etc/sysconfig %{buildroot}/etc/httpd/conf.d
cp %{SOURCE19} %{buildroot}/etc/httpd/conf.d/munin-cgi.conf
-cat > %{buildroot}/etc/sysconfig/spawn-fcgi-munin <<EOT
+cat > %{buildroot}/etc/sysconfig/spawn-fcgi-munin <<EOT.spawn
# SAMPLE: Rename this file to /etc/sysconfig/spawn-fcgi and edit to fit
-# (Without something like this, munin-cgi will not work properly via init script)
-SOCKET=/var/run/munin/fcgi-graph.sock
+# (Without this, nginx + munin-cgi will not work properly via init script)
+SOCKET=/var/run/mod_fcgid/fcgi-graph.sock
OPTIONS="-U apache -u apache -g apache -s $SOCKET -S -M 0600 -C 32 -F 1 -P \
/var/run/spawn-fcgi.pid -- /var/www/cgi-bin/munin-cgi-graph"
-EOT
+EOT.spawn
+
+# Create sample htpasswd file
+touch %{buildroot}/etc/munin/munin-htpasswd
+# Fix munin-check to report more accurately
+sed -i -e '
+ s,nobody,munin,;
+ s,owner_ok /var/log/munin .*,owner_ok /var/log/munin apache,;
+ s,owner_ok /var/lib/munin .*,owner_ok /var/lib/munin munin,;
+ s,owner_ok /var/lib/munin/plugin-state .*,owner_ok /var/lib/munin/plugin-state \
root,; + ' %{buildroot}/usr/bin/munin-check
%clean
rm -rf %{buildroot}
@@ -632,18 +654,31 @@ exit 0
%files cgi
%defattr(-,root,root)
-%attr(0755,root,root) %dir /var/www/cgi-bin
%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
%config(noreplace) %{_sysconfdir}/httpd/conf.d/munin-cgi.conf
+%config(noreplace) %{_sysconfdir}/munin/munin-htpasswd
%if 0%{?rhel} > 6 || 0%{?fedora} > 15
/lib/systemd/system/munin-fcgi-html.service
/lib/systemd/system/munin-fcgi-graph.service
%endif
+%attr(0755,root,root) %dir /var/lib/munin/cgi-tmp
+%attr(0755,apache,apache) %dir /var/lib/munin/cgi-tmp/munin-cgi-graph
%changelog
+* Thu Dec 06 2012 D. Johnson <fenris02@fedoraproject.org> - 2.0.9-2
+- Require: LWP::UserAgent for plugins
+- BZ# 861816 Add simplified files for switching to FCGI
+- BZ# 880505 Change logrotate files to include su directive
+
+* Thu Dec 06 2012 D. Johnson <fenris02@fedoraproject.org> - 2.0.9-1
+- Update to 2.0.9
+
+* Fri Nov 30 2012 D. Johnson <fenris02@fedoraproject.org> - 2.0.8-3
+- BZ# 880505 munin logrotate permissions fix.
+
* Tue Nov 13 2012 D. Johnson <fenris02@fedoraproject.org> - 2.0.8-2
- Added cgitmp patch c/o Diego Elio Pettenò <flameeyes@flameeyes.eu>
- BZ# 861816 Add sample files for switching to FCGI
diff --git a/sources b/sources
index b142c5e..d44d8a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74d19a1b4c89c6ad0d5b3912a9cd9150 munin-2.0.8.tar.gz
+bcec945e070d09f2b7deb82dee347e0e munin-2.0.9.tar.gz
https://src.fedoraproject.org/rpms/munin/c/d96d2da4c69b77fde02386c2346b638a796c9a5e?branch=f28
_______________________________________________
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/VBXEMQDSXBR6DTQQN33DBD73SLI4PXRI/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic