[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 epel7"
From: notifications () fedoraproject ! org
Date: 2018-08-24 19:48:33
Message-ID: 20180824194833.B3C18609DB26 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]
Notification time stamped 2018-08-24 19:44:35 UTC
From 7d008bdcf6021aaef059d9dd3d109bad0db810f7 Mon Sep 17 00:00:00 2001
From: d. johnson <fenris02@fedoraproject.org>
Date: Oct 17 2014 02:17:22 +0000
Subject: Merge remote-tracking branch 'origin/master' into epel7
---
diff --git a/.gitignore b/.gitignore
index 9df3d87..b3f2ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ munin-1.4.5.tar.gz
/munin-2.0.19.tar.gz
/munin-2.0.20.tar.gz
/munin-2.0.21.tar.gz
+/munin-2.0.22.tar.gz
diff --git a/linux-init.d_munin-asyncd.in b/linux-init.d_munin-asyncd.in
index a164d4a..239cea7 100644
--- a/linux-init.d_munin-asyncd.in
+++ b/linux-init.d_munin-asyncd.in
@@ -18,7 +18,7 @@
ASYNC_BIN=munin-asyncd
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/${ASYNC_BIN}
-PIDFILE=/var/run/${ASYNC_BIN}.pid
+PIDFILE=/var/run/munin/${ASYNC_BIN}.pid
is_running () {
if [ ! -e "$PIDFILE" ]; then
diff --git a/munin-2.0.21.tar.gz.sha256sum b/munin-2.0.21.tar.gz.sha256sum
deleted file mode 100644
index 38302d8..0000000
--- a/munin-2.0.21.tar.gz.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-76ad6602706f3449e727adbfc35014e9b4193b3691a5ca032d5a8d78e9ed259b \
munin-2.0.21.tar.gz
diff --git a/munin-2.0.22.tar.gz.sha256sum b/munin-2.0.22.tar.gz.sha256sum
new file mode 100644
index 0000000..7b4ea96
--- /dev/null
+++ b/munin-2.0.22.tar.gz.sha256sum
@@ -0,0 +1 @@
+31072cdd844788642576dd81983fecd42699e030d8c0128ee506948dda0c43e7 \
munin-2.0.22.tar.gz
diff --git a/munin-2.0.9-amavis-config b/munin-2.0.9-amavis-config
new file mode 100644
index 0000000..0a7f0ba
--- /dev/null
+++ b/munin-2.0.9-amavis-config
@@ -0,0 +1,4 @@
+[amavis]
+group adm
+env.MUNIN_MKTEMP /bin/mktemp -p /tmp/ $1
+env.amavislog /var/log/mail.info
diff --git a/munin.spec b/munin.spec
index 6ca5daf..99fc216 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
Name: munin
-Version: 2.0.21
-Release: 5%{?dist}
+Version: 2.0.22
+Release: 1%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
Group: System Environment/Daemons
@@ -31,6 +31,7 @@ Source20: Makefile.config-dist
Source21: nginx_munin.conf
Source22: munin-fcgi-html.rc
Source23: munin-fcgi-graph.rc
+Source24: munin-2.0.9-amavis-config
#Patch1: munin-1.4.6-restorecon.patch
#Patch2: munin-1.4.2-fontfix.patch
@@ -474,6 +475,9 @@ install -m 0644 %{SOURCE6} \
%{buildroot}/etc/munin/plugin-conf.d/postfix # install df config to exclude fses we \
shouldn't try and monitor install -m 0644 %{SOURCE7} \
%{buildroot}/etc/munin/plugin-conf.d/df
+# Install amavis config file to set MUNIN_MKTEMP env
+install -m 0644 %{SOURCE24} %{buildroot}/etc/munin/plugin-conf.d/amavis
+
# Append for BZ# 746083
cat - >> %{buildroot}/etc/munin/plugin-conf.d/munin-node <<EOT.node
[diskstats]
@@ -731,6 +735,7 @@ exit 0
%dir %attr(0755,root,root) /var/log/munin-node
%config(noreplace) %{_sysconfdir}/logrotate.d/munin-node
%config(noreplace) %{_sysconfdir}/munin/munin-node.conf
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/amavis
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/df
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/fw_
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/hddtemp_smartctl
@@ -819,6 +824,18 @@ exit 0
%changelog
+* Fri Oct 17 2014 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.22-1
+- Upstream released 2.0.22
+
+* Tue Oct 07 2014 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.21-8
+- BZ# 1149948 - munin-async pid file in /var/run rather than /var/run/munin
+
+* Mon Sep 15 2014 Petr Pisar <ppisar@redhat.com> - 2.0.21-6
+- Build against perl 5.20
+
+* Sun Sep 14 2014 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.21-6
+- Add amavis plugin config defaults
+
* Sun Sep 07 2014 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.21-5
- BZ# 1114857 - munin-2.0.21-2.fc21 FTBFS: No Package found for java-1.7.0-devel
- re-merge earlier commit for epel7
diff --git a/sources b/sources
index 94751f9..ff27f93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3bf802b0910d930a93351746aa717d3f munin-2.0.21.tar.gz
+f9f5cecea33714c57b523896c0a905dd munin-2.0.22.tar.gz
https://src.fedoraproject.org/rpms/munin/c/7d008bdcf6021aaef059d9dd3d109bad0db810f7?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/56CGKYMTSEXCBGSEUIM5Y5FPJJSA3TS2/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic