[packages/munin] - up to 2.0.17 - added systemd service for munin-node
baggins
baggins at pld-linux.org
Sat Aug 17 21:04:25 CEST 2013
commit 86c1c31498d3d98928a406260dbf4a47ccb87681
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Aug 17 21:03:10 2013 +0200
- up to 2.0.17
- added systemd service for munin-node
munin-Makefile.patch | 28 +-
munin-apache.conf | 59 ++-
munin-httpd.conf | 56 ++-
munin-lighttpd.conf | 2 +-
munin-node.service | 13 +
munin-plugins.patch | 1102 +++++++++++++++++++++---------------------
munin-separate-configs.patch | 812 ++++++++++++++++---------------
munin-templatedir.patch | 60 ++-
munin-timeout.patch | 6 +-
munin.logrotate | 2 +
munin.spec | 73 ++-
11 files changed, 1185 insertions(+), 1028 deletions(-)
---
diff --git a/munin.spec b/munin.spec
index b951e18..eb731d4 100644
--- a/munin.spec
+++ b/munin.spec
@@ -9,12 +9,12 @@
Summary: Munin - the Linpro RRD data agent
Summary(pl.UTF-8): Munin - agent danych RRD Linpro
Name: munin
-Version: 1.4.5
-Release: 11
+Version: 2.0.17
+Release: 1
License: GPL
Group: Applications/WWW
-Source0: http://dl.sourceforge.net/munin/%{name}-%{version}.tar.gz
-# Source0-md5: 4ae84b9a27b686c3819d8d7b51d8cb4c
+Source0: http://downloads.sourceforge.net/munin/%{name}-%{version}.tar.gz
+# Source0-md5: 80c8e6090963ad888e43b90c77f0a866
Source1: %{name}-node.init
Source2: %{name}.cron
Source3: %{name}-apache.conf
@@ -23,6 +23,7 @@ Source5: %{name}-node.logrotate
Source6: %{name}-lighttpd.conf
Source7: %{name}.tmpfiles
Source8: %{name}-httpd.conf
+Source9: %{name}-node.service
Patch0: %{name}-Makefile.patch
Patch1: %{name}-plugins.patch
Patch2: %{name}-templatedir.patch
@@ -33,12 +34,13 @@ BuildRequires: perl-Net-SNMP
BuildRequires: perl-devel
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.671
BuildRequires: which
Requires(triggerpostun): sed >= 4.0
Requires: %{name}-common = %{version}-%{release}
Requires: fonts-TTF-DejaVu
Requires: perl-Date-Manip
+Requires: perl-FCGI
Requires: perl-HTML-Template
Requires: perl-Net-Server
Requires: rrdtool >= 1.3.0
@@ -104,6 +106,7 @@ Requires: perl-Net-Server
Requires: perl-libwww
Requires: procps >= 2.0.7
Requires: rc-scripts >= 0.4.0.15
+Requires: systemd-units >= 38
Requires: sysstat
Conflicts: logrotate < 3.7-4
@@ -131,10 +134,12 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,cron.d,logrotate.d},%{_bindir},%{_sbindir}} \
$RPM_BUILD_ROOT/var/log/archive/munin \
$RPM_BUILD_ROOT%{_webapps}/%{_webapp} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+ $RPM_BUILD_ROOT/usr/lib/tmpfiles.d \
+ $RPM_BUILD_ROOT%{systemdunitdir}
%{__make} -j1 install \
JCVALID=no \
+ CHOWN=/bin/true \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/munin-node
@@ -148,9 +153,15 @@ install %{SOURCE6} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
install %{SOURCE7} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}/munin-node.service
+
install dists/tarball/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}
ln -sf %{_sysconfdir}/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}/plugin-conf.d/munin-node
+for f in cgi-graph cgi-html graph html limits update ; do
+ touch $RPM_BUILD_ROOT/var/log/munin/munin-$f.log
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -192,18 +203,33 @@ for i in *; do
esac
done
+%post
+for f in cgi-graph cgi-html graph html limits update ; do
+ touch /var/log/munin/munin-$f.log
+ chmod 660 /var/log/munin/munin-$f.log
+ chown munin:http /var/log/munin/munin-$f.log
+done
+
%post node
if [ "$1" = "1" ] ; then
/sbin/chkconfig --add munin-node
%{_sbindir}/munin-node-configure --shell | sh
fi
%service munin-node restart "Munin Node agent"
+%systemd_post munin-node.service
%preun node
if [ "$1" = "0" ] ; then
%service munin-node stop
/sbin/chkconfig --del munin-node
fi
+%systemd_preun munin-node.service
+
+%postun node
+%systemd_reload
+
+%triggerpostun node -- munin-node < 2.0.17-1
+%systemd_trigger munin-node.service
%pre common
%groupadd -g 158 munin
@@ -218,14 +244,17 @@ fi
%files
%defattr(644,root,root,755)
%dir %attr(750,munin,http) %{_webapps}/%{_webapp}
-%dir %attr(750,munin,http) %{_webapps}/%{_webapp}/templates
-%dir %attr(750,munin,http) %{_webapps}/%{_webapp}/templates/partial
-%{_webapps}/%{_webapp}/templates/*.css
-%{_webapps}/%{_webapp}/templates/*.html
-%{_webapps}/%{_webapp}/templates/*.ico
-%{_webapps}/%{_webapp}/templates/*.png
+%dir %attr(750,munin,http) %{_webapps}/%{_webapp}/munin-conf.d
+%dir %{_webapps}/%{_webapp}/templates
%{_webapps}/%{_webapp}/templates/*.tmpl
-%{_webapps}/%{_webapp}/templates/partial/*
+%dir %{_webapps}/%{_webapp}/templates/static
+%{_webapps}/%{_webapp}/templates/static/*.css
+%{_webapps}/%{_webapp}/templates/static/*.html
+%{_webapps}/%{_webapp}/templates/static/*.ico
+%{_webapps}/%{_webapp}/templates/static/*.js
+%{_webapps}/%{_webapp}/templates/static/*.png
+%dir %{_webapps}/%{_webapp}/templates/partial
+%{_webapps}/%{_webapp}/templates/partial/*.tmpl
%config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/munin.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
@@ -238,9 +267,11 @@ fi
%attr(755,root,root) %{_datadir}/munin/munin-html
%attr(755,root,root) %{_datadir}/munin/munin-limits
%attr(755,root,root) %{_datadir}/munin/munin-update
+%attr(755,root,root) %{_datadir}/munin/munin-datafile2storable
+%attr(755,root,root) %{_datadir}/munin/munin-storable2datafile
%attr(755,munin,root) %dir %{_datadir}/munin/cgi
%attr(755,munin,root) %{_datadir}/munin/cgi/munin-cgi-graph
-%attr(755,munin,root) %{_datadir}/munin/cgi/munin-fastcgi-graph
+%attr(755,munin,root) %{_datadir}/munin/cgi/munin-cgi-html
%attr(755,munin,root) %dir %{_htmldir}
%{perl_vendorlib}/Munin/Master
%{_mandir}/man3/Munin::Master*
@@ -252,7 +283,14 @@ fi
%{_mandir}/man8/munin-limits*
%{_mandir}/man8/munin-update*
%{_mandir}/man8/munin.*
-%attr(770,munin,munin) %dir /var/lib/munin/db
+%attr(771,munin,munin) %dir /var/lib/munin/db
+%attr(770,munin,http) %dir /var/lib/munin/db/cgi-tmp
+%attr(660,munin,http) %ghost /var/log/munin/munin-cgi-graph.log
+%attr(660,munin,http) %ghost /var/log/munin/munin-cgi-html.log
+%attr(660,munin,http) %ghost /var/log/munin/munin-graph.log
+%attr(660,munin,http) %ghost /var/log/munin/munin-html.log
+%attr(660,munin,http) %ghost /var/log/munin/munin-limits.log
+%attr(660,munin,http) %ghost /var/log/munin/munin-update.log
%files common
%defattr(644,root,root,755)
@@ -277,13 +315,17 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-conf.d/munin-node
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/munin-node
%attr(754,root,root) /etc/rc.d/init.d/munin-node
+%{systemdunitdir}/munin-node.service
%attr(755,root,root) %{_bindir}/munindoc
%attr(755,root,root) %{_sbindir}/munin-node
%attr(755,root,root) %{_sbindir}/munin-node-configure
%attr(755,root,root) %{_sbindir}/munin-run
+%attr(755,root,root) %{_sbindir}/munin-sched
%{perl_vendorlib}/Munin/Node
%{perl_vendorlib}/Munin/Plugin
%{perl_vendorlib}/Munin/Plugin.pm
+%attr(755,root,root) %{_datadir}/munin/munin-async
+%attr(755,root,root) %{_datadir}/munin/munin-asyncd
%dir %{_datadir}/munin/plugins
%attr(755,root,root) %{_datadir}/munin/plugins/*
%if !%{with sybase}
@@ -292,6 +334,7 @@ fi
%dir %attr(770,munin,munin) /var/lib/munin/plugin-state
%{_mandir}/man1/munin-node*
%{_mandir}/man1/munin-run*
+%{_mandir}/man1/munin-sched*
%{_mandir}/man1/munindoc*
%{_mandir}/man3/Munin::Node*
%{_mandir}/man3/Munin::Plugin*
diff --git a/munin-Makefile.patch b/munin-Makefile.patch
index 9fabd19..e808657 100644
--- a/munin-Makefile.patch
+++ b/munin-Makefile.patch
@@ -24,7 +24,7 @@
@@ -17,10 +17,10 @@
#
# the base of the Munin installation.
- #
+ #
-PREFIX = $(DESTDIR)/opt/munin
+PREFIX = $(DESTDIR)/usr
@@ -34,7 +34,7 @@
# Server only - where to put munin-cron
BINDIR = $(PREFIX)/bin
-@@ -32,34 +32,34 @@
+@@ -32,31 +32,31 @@
DOCDIR = $(PREFIX)/doc
# Where to put man pages
@@ -51,24 +51,22 @@
+HTMLDIR = $(DESTDIR)/var/lib/munin/html
+CGIDIR = $(LIBDIR)/cgi
- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental. Place on ramdisk to make munin
- # scale better. On many versions of Linux as well as on Solaris
- # /tmp will be a ramdisk.
-
--SSPOOLDIR = $(PREFIX)/spool
-+SSPOOLDIR = $(PREFIX)/var/spool/munin
-
- # Suggested directory name for a pulic ramdisk based tmp directory.
- # SSPOOLDIR := /tmp/muninspool
-
- # Client only - Where to put RRD files and other intenal data
+ # Where to put internal data for master (RRD, internal files, ...)
-DBDIR = $(DESTDIR)/var/opt/munin
+DBDIR = $(DESTDIR)/var/lib/munin/db
+ # Where to put internal data for node (plugin state, ...)
+-DBDIRNODE = $(DESTDIR)/var/opt/munin-node
++DBDIRNODE = $(DESTDIR)/var/lib/munin/db-node
+
+ # Client only - Where the spool files are written. Must be writable by
+ # group "munin", and should be preserved between reboots
+-SPOOLDIR = $(DBDIR)/spool
++SPOOLDIR = $(DESTDIR)/var/spool/munin
+
# Client only - Where plugins should put their states. Must be writable by
# group "munin", and should be preserved between reboots
--PLUGSTATE = $(DBDIR)/plugin-state
+-PLUGSTATE = $(DBDIRNODE)/plugin-state
+PLUGSTATE = $(DESTDIR)/var/lib/munin/plugin-state
# Where Munin should place its logs.
diff --git a/munin-apache.conf b/munin-apache.conf
index e9418e7..e0d0a0a 100644
--- a/munin-apache.conf
+++ b/munin-apache.conf
@@ -1,11 +1,52 @@
-ScriptAlias /munin/dyn/ /usr/share/munin/cgi/
+Alias /munin/static /etc/webapps/munin/templates/static
+
+<Directory /etc/webapps/munin/templates/static>
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+</Directory>
+
+# Configuration for 'html_strategy cgi'
+#ScriptAlias /munin /usr/share/munin/cgi/munin-cgi-html
+
+ScriptAlias /munin-cgi/munin-cgi-graph /usr/share/munin/cgi/munin-cgi-graph
+
+# Ensure we can run (fast)cgi scripts
+<Directory /usr/share/munin/cgi>
+ Options +ExecCGI
+ <IfModule mod_fcgid.c>
+ SetHandler fcgid-script
+ </IfModule>
+ <IfModule mod_fastcgi.c>
+ SetHandler fastcgi-script
+ </IfModule>
+ <IfModule !mod_fastcgi.c>
+ <IfModule !mod_fcgid.c>
+ SetHandler cgi-script
+ </IfModule>
+ </IfModule>
+
+ AllowOverride None
+
+ Order allow,deny
+ Allow from all
+# OR
+ # Make Munin password protected
+# AuthUserFile /etc/webapps/munin/htpasswd
+# AuthName "Munin"
+# AuthType Basic
+# require valid-user
+</Directory>
+
+# Configuration for 'html_strategy cron' (default)
Alias /munin /var/lib/munin/html/
<Directory /var/lib/munin/html>
AllowOverride None
+
Order allow,deny
Allow from all
-
+# OR
# Make Munin password protected
# AuthUserFile /etc/webapps/munin/htpasswd
# AuthName "Munin"
@@ -21,17 +62,3 @@ Alias /munin /var/lib/munin/html/
ExpiresDefault M310
</IfModule>
</Directory>
-
-#
-# Apache configuration to support munin-cgi-graph
-#
-# In addition, the Munin log files and html area should be writable
-# to the web server.
-#
-
-<Directory /usr/share/munin/cgi>
- AllowOverride None
- Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/munin-httpd.conf b/munin-httpd.conf
index c5d94e4..0823b93 100644
--- a/munin-httpd.conf
+++ b/munin-httpd.conf
@@ -1,10 +1,49 @@
-ScriptAlias /munin/dyn/ /usr/share/munin/cgi/
+Alias /munin/static /etc/webapps/munin/templates/static
+
+<Directory /etc/webapps/munin/templates/static>
+ AllowOverride None
+ Require all granted
+</Directory>
+
+# Configuration for 'html_strategy cgi'
+#ScriptAlias /munin /usr/share/munin/cgi/munin-cgi-html
+
+ScriptAlias /munin-cgi/munin-cgi-graph /usr/share/munin/cgi/munin-cgi-graph
+
+# Ensure we can run (fast)cgi scripts
+<Directory /usr/share/munin/cgi>
+ Options +ExecCGI
+ <IfModule mod_fcgid.c>
+ SetHandler fcgid-script
+ </IfModule>
+ <IfModule mod_fastcgi.c>
+ SetHandler fastcgi-script
+ </IfModule>
+ <IfModule !mod_fastcgi.c>
+ <IfModule !mod_fcgid.c>
+ SetHandler cgi-script
+ </IfModule>
+ </IfModule>
+
+ AllowOverride None
+
+ Require all granted
+# OR
+ # Make Munin password protected
+# AuthUserFile /etc/webapps/munin/htpasswd
+# AuthName "Munin"
+# AuthType Basic
+# require valid-user
+</Directory>
+
+# Configuration for 'html_strategy cron' (default)
Alias /munin /var/lib/munin/html/
<Directory /var/lib/munin/html>
AllowOverride None
- Require all granted
+ Require all granted
+# OR
# Make Munin password protected
# AuthUserFile /etc/webapps/munin/htpasswd
# AuthName "Munin"
@@ -20,16 +59,3 @@ Alias /munin /var/lib/munin/html/
ExpiresDefault M310
</IfModule>
</Directory>
-
-#
-# Apache configuration to support munin-cgi-graph
-#
-# In addition, the Munin log files and html area should be writable
-# to the web server.
-#
-
-<Directory /usr/share/munin/cgi>
- AllowOverride None
- Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Require all granted
-</Directory>
diff --git a/munin-lighttpd.conf b/munin-lighttpd.conf
index f45a25b..618af2d 100644
--- a/munin-lighttpd.conf
+++ b/munin-lighttpd.conf
@@ -1,6 +1,6 @@
alias.url += (
"/munin/" => "/var/lib/munin/html/",
- "/munin/dyn" => "/usr/share/munin/cgi/",
+ "/munin-cgi" => "/usr/share/munin/cgi/",
)
#$HTTP["url"] =~ "^/munin/" {
diff --git a/munin-node.service b/munin-node.service
new file mode 100644
index 0000000..44b7d6d
--- /dev/null
+++ b/munin-node.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Munin Node Server
+Documentation=man:munin-node
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/munin/munin-node.pid
+ExecStart=/usr/sbin/munin-node
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/munin-plugins.patch b/munin-plugins.patch
index 0090e44..2fade3f 100644
--- a/munin-plugins.patch
+++ b/munin-plugins.patch
@@ -1,6 +1,6 @@
-diff -Naur munin-1.3.4/dists/tarball/plugins.conf munin-1.3.4-p/dists/tarball/plugins.conf
---- munin-1.3.4/dists/tarball/plugins.conf Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/dists/tarball/plugins.conf Fri Apr 4 11:13:06 2008
+diff -urN munin-2.0.17/dists/tarball/plugins.conf munin-2.0.17-plugins/dists/tarball/plugins.conf
+--- munin-2.0.17/dists/tarball/plugins.conf 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/dists/tarball/plugins.conf 2013-08-17 13:18:51.817585940 +0200
@@ -14,6 +14,9 @@
#
#
@@ -11,7 +11,7 @@ diff -Naur munin-1.3.4/dists/tarball/plugins.conf munin-1.3.4-p/dists/tarball/pl
[mysql*]
#env.mysqlopts -u someuser
-@@ -31,3 +31,128 @@
+@@ -31,3 +34,128 @@
[postfix*]
user root
@@ -140,10 +140,47 @@ diff -Naur munin-1.3.4/dists/tarball/plugins.conf munin-1.3.4-p/dists/tarball/pl
+
+[cupsys_pages]
+user root
-diff -Naur munin-1.3.4/plugins/node.d/apache_accesses.in munin-1.3.4-p/plugins/node.d/apache_accesses.in
---- munin-1.3.4/plugins/node.d/apache_accesses.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/apache_accesses.in Fri Apr 4 11:13:06 2008
-@@ -86,6 +86,7 @@
+diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/node.d/amavis.in
+--- munin-2.0.17/plugins/node.d/amavis.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/amavis.in 2013-08-17 13:18:51.820919315 +0200
+@@ -77,13 +77,12 @@
+ =cut
+
+ mktempfile () {
+- cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/`
+- $cmd
++ mktemp -p /tmp/ $1
+ }
+
+ AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info}
+ LOGTAIL=${logtail:-logtail}
+-STATEFILE=$MUNIN_PLUGSTATE/amavis.offset
++STATEFILE=@@PLUGSTATE@@/amavis.offset
+
+ if [ "$1" = "autoconf" ]; then
+ if [ -f "${AMAVIS_LOG}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then
+@@ -106,7 +105,7 @@
+
+ if [ "$1" = "config" ]; then
+ echo 'graph_title Amavis filter statistics'
+- echo 'graph_vlabel \#'
++ echo 'graph_vlabel mails'
+ echo 'graph_category antivirus'
+ echo 'virus.label virus'
+ echo 'virus.info Number of viruses caught in email'
+@@ -124,7 +123,7 @@
+ spamm=U
+ spams=U
+
+-TEMP_FILE=$(mktempfile munin-amavis.XXXXXX)
++TEMP_FILE=$(mktempfile munin-amavis.XXXXXXXXXX)
+
+ if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]
+ then
+diff -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/plugins/node.d/apache_accesses.in
+--- munin-2.0.17/plugins/node.d/apache_accesses.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/apache_accesses.in 2013-08-17 13:18:51.817585940 +0200
+@@ -89,6 +89,7 @@
my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
@@ -151,7 +188,7 @@ diff -Naur munin-1.3.4/plugins/node.d/apache_accesses.in munin-1.3.4-p/plugins/n
if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
{
-@@ -114,7 +115,11 @@
+@@ -129,7 +130,11 @@
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
@@ -164,18 +201,18 @@ diff -Naur munin-1.3.4/plugins/node.d/apache_accesses.in munin-1.3.4-p/plugins/n
print "graph_args --base 1000\n";
print "graph_vlabel accesses / \${graph_period}\n";
print "graph_category apache\n";
-diff -Naur munin-1.3.4/plugins/node.d/apache_processes.in munin-1.3.4-p/plugins/node.d/apache_processes.in
---- munin-1.3.4/plugins/node.d/apache_processes.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/apache_processes.in Fri Apr 4 11:13:06 2008
-@@ -88,6 +88,7 @@
+diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/plugins/node.d/apache_processes.in
+--- munin-2.0.17/plugins/node.d/apache_processes.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/apache_processes.in 2013-08-17 13:18:51.817585940 +0200
+@@ -96,6 +96,7 @@
my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
+my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
+ my $SHOWFREE = !exists $ENV{'showfree'} || $ENV{'showfree'};
if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- {
-@@ -119,7 +120,11 @@
+@@ -136,7 +137,11 @@
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
@@ -188,10 +225,10 @@ diff -Naur munin-1.3.4/plugins/node.d/apache_processes.in munin-1.3.4-p/plugins/
print "graph_args --base 1000 -l 0\n";
print "graph_category apache\n";
print "graph_order ";
-diff -Naur munin-1.3.4/plugins/node.d/apache_volume.in munin-1.3.4-p/plugins/node.d/apache_volume.in
---- munin-1.3.4/plugins/node.d/apache_volume.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/apache_volume.in Fri Apr 4 11:13:06 2008
-@@ -86,6 +86,7 @@
+diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plugins/node.d/apache_volume.in
+--- munin-2.0.17/plugins/node.d/apache_volume.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/apache_volume.in 2013-08-17 13:18:51.817585940 +0200
+@@ -89,6 +89,7 @@
my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
@@ -199,7 +236,7 @@ diff -Naur munin-1.3.4/plugins/node.d/apache_volume.in munin-1.3.4-p/plugins/nod
if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
{
-@@ -114,7 +115,11 @@
+@@ -129,7 +130,11 @@
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
@@ -212,34 +249,43 @@ diff -Naur munin-1.3.4/plugins/node.d/apache_volume.in munin-1.3.4-p/plugins/nod
print "graph_args --base 1000\n";
print "graph_vlabel bytes per \${graph_period}\n";
print "graph_category apache\n";
-diff -Naur munin-1.3.4/plugins/node.d/bind9.in munin-1.3.4-p/plugins/node.d/bind9.in
---- munin-1.3.4/plugins/node.d/bind9.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/bind9.in Fri Apr 4 11:13:06 2008
-@@ -19,7 +19,7 @@
- my %IN;
+diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node.d/bind9.in
+--- munin-2.0.17/plugins/node.d/bind9.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/bind9.in 2013-08-17 13:18:51.820919315 +0200
+@@ -53,7 +53,7 @@
+ use strict;
- sub get_state {
-- open(Q,"< $STATEFILE") or die;
-+ open(Q,"< $STATEFILE") or return;
+ my $QUERYLOG = $ENV{logfile} || '/var/log/bind9/query.log';
+-my $STATEFILE= "$ENV{MUNIN_PLUGSTATE}/bind9.state";
++my $STATEFILE= "@@PLUGSTATE@@/bind9.state";
+
+ my $OTHER=0;
+ my %IN;
+@@ -63,7 +63,7 @@
+ open(Q, ">", $STATEFILE);
+ close(Q);
+ }
+- open(Q,"< $STATEFILE") or die ("Cannot open state file");
++ open(Q,"< $STATEFILE") or return ("Cannot open state file");
while (<Q>) {
chomp;
my ($q,$n) = split(/\s+/,$_,2);
-diff -Naur munin-1.3.4/plugins/node.d/courier_.in munin-1.3.4-p/plugins/node.d/courier_.in
---- munin-1.3.4/plugins/node.d/courier_.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/courier_.in Fri Apr 4 11:13:06 2008
-@@ -35,7 +35,7 @@
+diff -urN munin-2.0.17/plugins/node.d/courier_.in munin-2.0.17-plugins/plugins/node.d/courier_.in
+--- munin-2.0.17/plugins/node.d/courier_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/courier_.in 2013-08-17 13:18:51.817585940 +0200
+@@ -55,7 +55,7 @@
COURIER_LOG=${logfile:-/var/log/mail.log}
SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
- OFFSET_FILE=@@PLUGSTATE@@/courier_${SERVICE}.offset
+ OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset
-LOGTAIL=${logtail:-/usr/sbin/logtail}
+LOGTAIL=${logtail:-`which logtail`}
mktempfile () {
@@MKTEMP@@
-diff -Naur munin-1.3.4/plugins/node.d/courier_mta_mailstats.in munin-1.3.4-p/plugins/node.d/courier_mta_mailstats.in
---- munin-1.3.4/plugins/node.d/courier_mta_mailstats.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/courier_mta_mailstats.in Fri Apr 4 11:13:06 2008
-@@ -101,7 +101,9 @@
+diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailstats.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in
+--- munin-2.0.17/plugins/node.d/courier_mta_mailstats.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in 2013-08-17 13:18:51.817585940 +0200
+@@ -108,7 +108,9 @@
if($startsize < $pos) {
# Log rotated
@@ -250,10 +296,10 @@ diff -Naur munin-1.3.4/plugins/node.d/courier_mta_mailstats.in munin-1.3.4-p/plu
$pos = 0;
}
-diff -Naur munin-1.3.4/plugins/node.d/courier_mta_mailvolume.in munin-1.3.4-p/plugins/node.d/courier_mta_mailvolume.in
---- munin-1.3.4/plugins/node.d/courier_mta_mailvolume.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/courier_mta_mailvolume.in Fri Apr 4 11:13:06 2008
-@@ -92,7 +92,9 @@
+diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in
+--- munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in 2013-08-17 13:18:51.817585940 +0200
+@@ -98,7 +98,9 @@
if($startsize < $pos) {
# Log rotated
@@ -264,10 +310,10 @@ diff -Naur munin-1.3.4/plugins/node.d/courier_mta_mailvolume.in munin-1.3.4-p/pl
$pos = 0;
}
-diff -Naur munin-1.3.4/plugins/node.d/cupsys_pages.in munin-1.3.4-p/plugins/node.d/cupsys_pages.in
---- munin-1.3.4/plugins/node.d/cupsys_pages.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/cupsys_pages.in Fri Apr 4 11:13:06 2008
-@@ -94,7 +94,9 @@
+diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in
+--- munin-2.0.17/plugins/node.d/cupsys_pages.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in 2013-08-17 13:18:51.817585940 +0200
+@@ -100,7 +100,9 @@
}
if ($startsize < $pos) {
# Log rotated
@@ -278,45 +324,48 @@ diff -Naur munin-1.3.4/plugins/node.d/cupsys_pages.in munin-1.3.4-p/plugins/node
$pos = 0;
}
-@@ -148,7 +148,7 @@
+@@ -146,7 +148,7 @@
while (tell(LOGFILE) < $stop) {
my $line = <LOGFILE>;
chomp ($line);
-- if ($line =~ /^(\S+)\s+\S+\s+\d+\s+\[[^\]]+\]\s+(\d+)\s+(\d+)\s+(\S+)\s+(\S+)$/) {
+- if ($line =~ /^(\S+)\s+\S+\s+\d+\s+\[[^\]]+\]\s+(\d+)\s+(\d+)\s+(\S+)\s+(\S+)/) {
+ if ($line =~ /^(\S+)\s+\S+\s+\S+\s+\[[^\]]+\]\s+(\d+)\s+(\d+)\s+(.+)$/) {
if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) {
$printers{$1} += int($2)*int($3);
} elsif(defined($printers{$1})) {
-diff -Naur munin-1.3.4/plugins/node.d/mailman.in munin-1.3.4-p/plugins/node.d/mailman.in
---- munin-1.3.4/plugins/node.d/mailman.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/mailman.in Fri Apr 4 11:13:06 2008
-@@ -26,7 +26,7 @@
-
- use Munin::Common::Defaults;
-
--$statefile = "$Munin::Common::Defaults::MUNIN_PLUGSTATE/munin-mailman-log.state";
-+$statefile = "$Munin::Common::Defaults::$ENV{MUNIN_PLUGSTATE}/munin-mailman-log.state";
- $pos = undef;
- $posts = 0;
- $members = 0;
-
-@@ -32,7 +32,12 @@
- # System paths (as known to mailman-limacute
- $logfile = "/var/log/mailman/post";
- $libdir = "/var/lib/mailman";
--$lister = "/usr/lib/mailman/bin/list_members";
-+
-+if (-f "/usr/lib64/mailman/bin/list_members") {
-+ $lister = "/usr/lib64/mailman/bin/list_members";
-+} else {
-+ $lister = "/usr/lib/mailman/bin/list_members";
+diff -urN munin-2.0.17/plugins/node.d/foldingathome_rank.in munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in
+--- munin-2.0.17/plugins/node.d/foldingathome_rank.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in 2013-08-17 13:18:51.820919315 +0200
+@@ -13,7 +13,7 @@
+ #%# family=contrib
+ #%# capabilities=autoconf
+
+-statefile=$MUNIN_PLUGSTATE/plugin-fah_rank.state
++statefile=@@PLUGSTATE@@/plugin-fah_rank.state
+
+ if [ "$1" = "autoconf" ]; then
+ # No real check of anything
+diff -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/node.d/mailman.in
+--- munin-2.0.17/plugins/node.d/mailman.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/mailman.in 2013-08-17 13:18:51.817585940 +0200
+@@ -38,7 +38,13 @@
+ # System paths
+ $logfile = $ENV{'logfile'} || "/var/log/mailman/post";
+ $libdir = $ENV{'libdir'} || "/var/lib/mailman";
+-$lister = $ENV{'lister'} || "/usr/lib/mailman/bin/list_members";
++$lister = $ENV{'lister'} || {
++ if (-f "/usr/lib64/mailman/bin/list_members") {
++ $lister = "/usr/lib64/mailman/bin/list_members";
++ } else {
++ $lister = "/usr/lib/mailman/bin/list_members";
++ }
+}
if (-f "$logfile.0")
{
-@@ -69,7 +69,9 @@
-
- if($startsize < $pos) {
+@@ -94,7 +100,9 @@
+ $startsize = 0;
+ } elsif($startsize < $pos) {
# Log rotated
- parseMailmanLog($rotlogfile, $pos, (stat $rotlogfile)[7]);
+ if (-f $rotlogfile) {
@@ -325,131 +374,278 @@ diff -Naur munin-1.3.4/plugins/node.d/mailman.in munin-1.3.4-p/plugins/node.d/ma
$pos = 0;
}
-diff -Naur munin-1.3.4/plugins/node.d/mysql_slowqueries.in munin-1.3.4-p/plugins/node.d/mysql_slowqueries.in
---- munin-1.3.4/plugins/node.d/mysql_slowqueries.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/mysql_slowqueries.in Fri Apr 4 11:13:06 2008
-@@ -47,5 +47,5 @@
+diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/node.d/mysql_.in
+--- munin-2.0.17/plugins/node.d/mysql_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/mysql_.in 2013-08-17 13:18:51.820919315 +0200
+@@ -39,6 +39,7 @@
+ env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=3306
+ env.mysqluser root
+ env.mysqlpassword geheim
++ env.mysqlnosuperpriv 1
+ env.cachenamespace munin_mysql_pri
+ [mysql2_*]
+ env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=13306
+@@ -156,6 +157,7 @@
+ 'user' => $ENV{'mysqluser'} || 'root',
+ 'password' => $ENV{'mysqlpassword'} || '',
+ 'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql',
++ 'nosuper' => $ENV{'mysqlnosuperpriv'} || 0,
+ );
+
+
+@@ -927,8 +929,10 @@
+
+ update_variables($dbh);
+ update_innodb($dbh);
+- update_master($dbh);
+- update_slave($dbh);
++ if (!$config{nosuper}) {
++ update_master($dbh);
++ update_slave($dbh);
++ }
+
+ $shared_memory_cache->set('data', $data);
+ }
+diff -urN munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in
+--- munin-2.0.17/plugins/node.d/mysql_innodb.in 2013-08-17 13:19:03.501062149 +0200
++++ munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in 2013-08-17 13:18:51.994254767 +0200
+@@ -1,4 +1,4 @@
+-#!@@GOODSH@@
++#!@@BASH@@
+
+ : << =cut
+
+diff -urN munin-2.0.17/plugins/node.d/mysql_slowqueries.in munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in
+--- munin-2.0.17/plugins/node.d/mysql_slowqueries.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in 2013-08-17 13:18:51.817585940 +0200
+@@ -64,5 +64,5 @@
exit 0
fi
-/usr/bin/printf "queries.value "
+/bin/printf "queries.value "
($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}'
-diff -Naur munin-1.3.4/plugins/node.d/mysql_threads.in munin-1.3.4-p/plugins/node.d/mysql_threads.in
---- munin-1.3.4/plugins/node.d/mysql_threads.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/mysql_threads.in Fri Apr 4 11:13:06 2008
-@@ -45,5 +45,5 @@
+diff -urN munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-plugins/plugins/node.d/mysql_threads.in
+--- munin-2.0.17/plugins/node.d/mysql_threads.in 2013-08-17 13:19:03.501062149 +0200
++++ munin-2.0.17-plugins/plugins/node.d/mysql_threads.in 2013-08-17 13:18:51.994254767 +0200
+@@ -74,5 +74,5 @@
exit 0
fi
-/usr/bin/printf "threads.value "
+/bin/printf "threads.value "
($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}'
-diff -Naur munin-1.3.4/plugins/node.d/ntp_.in munin-1.3.4-p/plugins/node.d/ntp_.in
---- munin-1.3.4/plugins/node.d/ntp_.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/ntp_.in Fri Apr 4 11:13:06 2008
-@@ -32,9 +32,9 @@
- my $nodelay = $ENV{'nodelay'} || 0;
+diff -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node.d/ntp_.in
+--- munin-2.0.17/plugins/node.d/ntp_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/ntp_.in 2013-08-17 13:18:51.817585940 +0200
+@@ -57,26 +57,26 @@
+ use Net::IP;
if ($ARGV[0] and $ARGV[0] eq "autoconf") {
-- `ntpq -c help >/dev/null 2>/dev/null`;
-+ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
- if ($? eq "0") {
-- if (`ntpq -c "hostnames no" -c peers | wc -l` > 0) {
-+ if (`/usr/sbin/ntpq -c "hostnames no" -c peers | wc -l` > 0) {
- print "yes\n";
- exit 0;
- } else {
-@@ -42,13 +42,13 @@
- exit 0;
- }
- } else {
-- print "no (ntpq not found)\n";
-+ print "no (/usr/sbin/ntpq not found)\n";
- exit 0;
- }
+- `ntpq -c help >/dev/null 2>/dev/null`;
++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+ if ($CHILD_ERROR eq "0") {
+- if (`ntpq -n -c peers | wc -l` > 0) {
++ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) {
+ print "yes\n";
+ exit 0;
+ } else {
+- print "no (ntpq -p returned no peers)\n";
++ print "no (/usr/sbin/ntpq -p returned no peers)\n";
+ exit 0;
+ }
+ } else {
+- print "no (ntpq not found)\n";
++ print "no (/usr/sbin/ntpq not found)\n";
+ exit 0;
+ }
}
if ($ARGV[0] and $ARGV[0] eq "suggest") {
-- my @lines = `ntpq -c "hostnames no" -c peers`;
-+ my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
- foreach (@lines) {
- next unless /^.(\d+\.\d+\.\d+\.\d+)/;
- next if /^.224\.0\.1\.1/;
-@@ -73,7 +73,7 @@
- exit 2 unless defined $name;
-
- if ($ARGV[0] and $ARGV[0] eq "config") {
-- my @lines = `ntpq -c "hostnames no" -c peers`;
-+ my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
- my $host;
- foreach (@lines) {
- next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+- foreach my $line (`ntpq -c associations`) {
++ foreach my $line (`/usr/sbin/ntpq -c associations`) {
+ if ($line =~ m/^\s*\d+/) {
+ my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, undef) = split(/\s+/, $line);
+- chomp(my $peerinfo = `ntpq -n -c "readvar $assid srcadr"`);
++ chomp(my $peerinfo = `/usr/sbin/ntpq -n -c "readvar $assid srcadr"`);
+ $peerinfo =~ s/\R/ /g;
+ my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
+ print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0";
@@ -108,7 +108,7 @@
- exit 0;
- }
+ my $delay;
+ my $offset;
+ my $jitter;
+-my @associations = `ntpq -c associations`;
++my @associations = `/usr/sbin/ntpq -c associations`;
+
+ foreach my $line (@associations) {
+ if ($line =~ m/^\s*\d+/) {
+diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_err.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in
+--- munin-2.0.17/plugins/node.d/ntp_kernel_err.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in 2013-08-17 13:18:51.820919315 +0200
+@@ -32,7 +32,7 @@
+ export PATH=/usr/local/sbin:$PATH
--my @lines = `ntpq -c "hostnames no" -c peers`;
-+my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
- foreach (@lines) {
- next unless /^.(\d+\.\d+\.\d+\.\d+)/;
- next if /^.224\.0\.1\.1/;
-diff -Naur munin-1.3.4/plugins/node.d/ntp_states.in munin-1.3.4-p/plugins/node.d/ntp_states.in
---- munin-1.3.4/plugins/node.d/ntp_states.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/ntp_states.in Fri Apr 4 11:13:06 2008
-@@ -35,9 +35,9 @@
- );
+ if [ "$1" = "autoconf" ]; then
+- { ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
++ { /usr/sbin/ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
+ awk 'BEGIN { ev=1; }
+ /^estimated error:/ { ev=0; }
+ END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+@@ -51,11 +51,11 @@
- if ($ARGV[0] and $ARGV[0] eq "autoconf") {
-- `ntpq -c help >/dev/null 2>/dev/null`;
-+ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
- if ($? eq "0") {
-- if (`ntpq -c "hostnames no" -c peers | wc -l` > 0) {
-+ if (`/usr/sbin/ntpq -c "hostnames no" -c peers | wc -l` > 0) {
- print "yes\n";
- exit 0;
- } else {
-@@ -45,7 +45,7 @@
- exit 0;
- }
- } else {
-- print "no (ntpq not found)\n";
-+ print "no (/usr/sbin/ntpq not found)\n";
- exit 0;
- }
+ printf 'ntp_err.value '
+
+-if [ $(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.') -ge 427 ]
++if [ $(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.') -ge 427 ]
+ then
+- cmd=ntpq
++ cmd=/usr/sbin/ntpq
+ else
+- cmd=ntpdc
++ cmd=/usr/sbin/ntpdc
+ fi
+
+ $cmd -c kerninfo | awk '/^estimated error:/ { print $3 }'
+diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 13:19:03.501062149 +0200
++++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 13:18:51.994254767 +0200
+@@ -39,7 +39,7 @@
+ export PATH=/usr/local/sbin:$PATH
+
+ if [ "$1" = "autoconf" ]; then
+- { ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
++ { /usr/sbin/ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
+ awk 'BEGIN { ev=1; }
+ /^pll frequency:/ { ev=0; }
+ END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+@@ -65,11 +65,11 @@
+
+ printf 'ntp_pll_freq.value '
+
+-if [ $(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.') -ge 427 ]
++if [ $(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.') -ge 427 ]
+ then
+- cmd=ntpq
++ cmd=/usr/sbin/ntpq
+ else
+- cmd=ntpdc
++ cmd=/usr/sbin/ntpdc
+ fi
+
+ $cmd -c kerninfo | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
+diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in
+--- munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in 2013-08-17 13:18:51.820919315 +0200
+@@ -32,7 +32,7 @@
+ export PATH=/usr/local/sbin:$PATH
+
+ if [ "$1" = "autoconf" ]; then
+- { ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
++ { /usr/sbin/ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
+ awk 'BEGIN { ev=1; }
+ /^pll offset:/ { ev=0; }
+ END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+@@ -51,11 +51,11 @@
+
+ printf 'ntp_pll_off.value '
+
+-if [ $(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.') -ge 427 ]
++if [ $(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.') -ge 427 ]
+ then
+- cmd=ntpq
++ cmd=/usr/sbin/ntpq
+ else
+- cmd=ntpdc
++ cmd=/usr/sbin/ntpdc
+ fi
+
+ $cmd -c kerninfo | awk '/^pll offset:/ { print $3 }'
+diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins/node.d/ntp_offset.in
+--- munin-2.0.17/plugins/node.d/ntp_offset.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/ntp_offset.in 2013-08-17 13:18:51.820919315 +0200
+@@ -38,9 +38,9 @@
+ =cut
+
+ do_autoconf () {
+- ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
++ /usr/sbin/ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
+
+- case "$(ntpq -n -p 2>/dev/null | wc -l)" in
++ case "$(/usr/sbin/ntpq -n -p 2>/dev/null | wc -l)" in
+ 0)
+ echo 'no (unable to list peers)'
+ exit 0
+@@ -57,7 +57,7 @@
}
-@@ -54,7 +54,7 @@
- print "graph_title NTP states\n";
- print "graph_args --base 1000 --vertical-label msec --lower-limit 0\n";
- print "graph_category time\n";
-- foreach (`ntpq -c "hostnames no" -c peers`) {
-+ foreach (`/usr/sbin/ntpq -c "hostnames no" -c peers`) {
- next unless /^.(\d+\.\d+\.\d+\.\d+)/;
- next if /^.224\.0\.1\.1/;
- my $addr = $1;
-@@ -75,7 +75,7 @@
- exit 0;
+
+ do_config () {
+- syspeer="$(ntpq -n -p | grep '^[*o]')"
++ syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
+
+ set - $syspeer
+
+@@ -86,7 +86,7 @@
+
+ do_ () {
+ # Fetch operation
+- syspeer="$(ntpq -n -p | grep '^[*o]')"
++ syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
+
+ set - $syspeer
+
+diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins/node.d/ntp_states.in
+--- munin-2.0.17/plugins/node.d/ntp_states.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/ntp_states.in 2013-08-17 13:18:51.820919315 +0200
+@@ -72,10 +72,10 @@
+ # 1 63933 931a yes yes none outlyer sys_peer 1
+ # 2 63934 943a yes yes none candidate sys_peer 3
+
+- foreach my $line (`ntpq -c associations`) {
++ foreach my $line (`/usr/sbin/ntpq -c associations`) {
+ if ($line =~ m/^\s*\d+/) {
+ my (undef, undef, $assid, undef, undef, undef, undef, $condition_str, undef, undef) = split(/\s+/, $line);
+- chomp(my $peerinfo = `ntpq -n -c "readvar $assid srcadr"`);
++ chomp(my $peerinfo = `/usr/sbin/ntpq -n -c "readvar $assid srcadr"`);
+ $peerinfo =~ s/\s//g;
+ my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
+
+@@ -125,17 +125,17 @@
}
--foreach (`ntpq -c "hostnames no" -c peers`) {
-+foreach (`/usr/sbin/ntpq -c "hostnames no" -c peers`) {
- next unless /^(.)(\d+\.\d+\.\d+\.\d+)/;
- next if /^.224\.0\.1\.1/;
- my $state = $1;
-diff -Naur munin-1.3.4/plugins/node.d/nut_misc.in munin-1.3.4-p/plugins/node.d/nut_misc.in
---- munin-1.3.4/plugins/node.d/nut_misc.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/nut_misc.in Fri Apr 4 11:13:06 2008
-@@ -5,7 +5,8 @@
+ if ($ARGV[0] and $ARGV[0] eq "autoconf") {
+- `ntpq -c help >/dev/null 2>/dev/null`;
++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+ if ($CHILD_ERROR eq "0") {
+- if (`ntpq -n -c peers | wc -l` > 0) {
++ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) {
+ print "yes\n";
+ exit 0;
+ } else {
+- print "no (ntpq -p returned no peers)\n";
++ print "no (/usr/sbin/ntpq -p returned no peers)\n";
+ exit 0;
+ }
+ } else {
+- print "no (ntpq not found)\n";
++ print "no (/usr/sbin/ntpq not found)\n";
+ exit 0;
+ }
+ }
+diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/node.d/nut_misc.in
+--- munin-2.0.17/plugins/node.d/nut_misc.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/nut_misc.in 2013-08-17 13:18:51.820919315 +0200
+@@ -38,7 +38,8 @@
my %status;
my %config = (
- upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'bertha at 127.0.0.1',
+ upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'bertha',
+ upshost => $ENV{"upshost"} ? $ENV{"upshost"} : '127.0.0.1',
- upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
+ upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
);
-@@ -15,11 +16,6 @@
+@@ -48,11 +49,6 @@
type => 'GAUGE',
draw => 'LINE2'
},
@@ -461,7 +657,7 @@ diff -Naur munin-1.3.4/plugins/node.d/nut_misc.in munin-1.3.4-p/plugins/node.d/n
'battery_runtime' => {
label => 'runtime - min',
type => 'GAUGE',
-@@ -43,7 +39,12 @@
+@@ -76,7 +72,12 @@
);
if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
@@ -475,7 +671,7 @@ diff -Naur munin-1.3.4/plugins/node.d/nut_misc.in munin-1.3.4-p/plugins/node.d/n
#print "graph_args -l 110\n";
#print "graph_vlabel Misc\n";
foreach my $key (keys %graph) {
-@@ -56,7 +57,7 @@
+@@ -89,7 +90,7 @@
}
sub fetch_values {
@@ -484,20 +680,20 @@ diff -Naur munin-1.3.4/plugins/node.d/nut_misc.in munin-1.3.4-p/plugins/node.d/n
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
-diff -Naur munin-1.3.4/plugins/node.d/nut_volts.in munin-1.3.4-p/plugins/node.d/nut_volts.in
---- munin-1.3.4/plugins/node.d/nut_volts.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/nut_volts.in Fri Apr 4 11:13:06 2008
-@@ -5,7 +5,8 @@
+diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/node.d/nut_volts.in
+--- munin-2.0.17/plugins/node.d/nut_volts.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/nut_volts.in 2013-08-17 13:18:51.820919315 +0200
+@@ -14,7 +14,8 @@
my %status;
my %config = (
- upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'bertha at 127.0.0.1',
+ upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'bertha',
+ upshost => $ENV{"upshost"} ? $ENV{"upshost"} : '127.0.0.1',
- upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
+ upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
);
-@@ -15,16 +16,6 @@
+@@ -24,16 +25,6 @@
type => 'GAUGE',
draw => 'LINE2'
},
@@ -514,7 +710,7 @@ diff -Naur munin-1.3.4/plugins/node.d/nut_volts.in munin-1.3.4-p/plugins/node.d/
'output_voltage' => {
label => 'output',
type => 'GAUGE',
-@@ -33,7 +24,12 @@
+@@ -42,7 +33,12 @@
);
if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
@@ -528,7 +724,7 @@ diff -Naur munin-1.3.4/plugins/node.d/nut_volts.in munin-1.3.4-p/plugins/node.d/
print "graph_args -l 115\n";
print "graph_vlabel Volts\n";
foreach my $key (keys %graph) {
-@@ -46,7 +42,7 @@
+@@ -55,7 +51,7 @@
}
sub fetch_values {
@@ -537,22 +733,22 @@ diff -Naur munin-1.3.4/plugins/node.d/nut_volts.in munin-1.3.4-p/plugins/node.d/
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
-diff -Naur munin-1.3.4/plugins/node.d/perdition.in munin-1.3.4-p/plugins/node.d/perdition.in
---- munin-1.3.4/plugins/node.d/perdition.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/perdition.in Fri Apr 4 11:13:06 2008
-@@ -30,7 +30,7 @@
+diff -urN munin-2.0.17/plugins/node.d/perdition.in munin-2.0.17-plugins/plugins/node.d/perdition.in
+--- munin-2.0.17/plugins/node.d/perdition.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/perdition.in 2013-08-17 13:18:51.820919315 +0200
+@@ -56,7 +56,7 @@
# Set the location of the perdition logs
PERDITION_LOG=${logfile:-/var/log/perdition.log}
- OFFSET_FILE=@@PLUGSTATE@@/perdition.offset
+ OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset
-LOGTAIL=${logtail:-/usr/sbin/logtail}
+LOGTAIL=${logtail:-`which logtail`}
case $1 in
autoconf|detect)
-diff -Naur munin-1.3.4/plugins/node.d/pop_stats.in munin-1.3.4-p/plugins/node.d/pop_stats.in
---- munin-1.3.4/plugins/node.d/pop_stats.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d/pop_stats.in Fri Apr 4 11:13:06 2008
-@@ -67,7 +67,9 @@
+diff -urN munin-2.0.17/plugins/node.d/pop_stats.in munin-2.0.17-plugins/plugins/node.d/pop_stats.in
+--- munin-2.0.17/plugins/node.d/pop_stats.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/pop_stats.in 2013-08-17 13:18:51.820919315 +0200
+@@ -68,7 +68,9 @@
if ($startsize < $pos)
{
# Log rotated
@@ -563,10 +759,56 @@ diff -Naur munin-1.3.4/plugins/node.d/pop_stats.in munin-1.3.4-p/plugins/node.d/
$pos = 0;
}
-diff -Naur munin-1.3.4/plugins/node.d.linux/iostat.in munin-1.3.4-p/plugins/node.d.linux/iostat.in
---- munin-1.3.4/plugins/node.d.linux/iostat.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d.linux/iostat.in Fri Apr 4 11:13:06 2008
-@@ -146,7 +146,7 @@
+diff -urN munin-2.0.17/plugins/node.d/postgres_scans_.in munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in
+--- munin-2.0.17/plugins/node.d/postgres_scans_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in 2013-08-17 13:18:51.820919315 +0200
+@@ -65,7 +65,6 @@
+ vlabel => 'Scans / sec',
+ basequery =>
+ "SELECT COALESCE(sum(seq_scan),0) AS sequential, COALESCE(sum(idx_scan),0) AS index FROM pg_stat_user_tables",
+- paramdatabase => 1,
+ pivotquery => 1,
+ configquery =>
+ "VALUES ('sequential','Sequential scans'), ('index','Index scans')",
+diff -urN munin-2.0.17/plugins/node.d/postgres_tuples_.in munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in
+--- munin-2.0.17/plugins/node.d/postgres_tuples_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in 2013-08-17 13:18:51.820919315 +0200
+@@ -74,7 +74,6 @@
+ . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables",
+ ],
+ ],
+- paramdatabase => 1,
+ pivotquery => 1,
+ configquery => [
+ "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted'),"
+diff -urN munin-2.0.17/plugins/node.d/slapd_.in munin-2.0.17-plugins/plugins/node.d/slapd_.in
+--- munin-2.0.17/plugins/node.d/slapd_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d/slapd_.in 2013-08-17 13:18:51.820919315 +0200
+@@ -37,7 +37,7 @@
+
+ # Change these to reflect your LDAP ACL. The given DN must have
+ # read access to the Monitor branch.
+-my $basedn = "cn=Monitor";
++my $basedn = ($ENV{'basedn'} || "cn=Monitor");
+ my $server = ($ENV{'server'} || 'localhost');
+ my $userdn = ($ENV{'binddn'} || '');
+ my $userpw = ($ENV{'bindpw'} || '');
+diff -urN munin-2.0.17/plugins/node.d.linux/files_.in munin-2.0.17-plugins/plugins/node.d.linux/files_.in
+--- munin-2.0.17/plugins/node.d.linux/files_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/files_.in 2013-08-17 13:18:51.820919315 +0200
+@@ -14,7 +14,7 @@
+ #%# capabilities=autoconf
+
+ PROC=${0##*/files_}
+-TMPFILE="$MUNIN_PLUGSTATE/munin-files_${PROC}.state"
++TMPFILE="@@PLUGSTATE@@/munin-files_${PROC}.state"
+
+ if [ "$1" = "autoconf" ]; then
+ if [ -x /usr/sbin/lsof ]; then
+diff -urN munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-plugins/plugins/node.d.linux/iostat.in
+--- munin-2.0.17/plugins/node.d.linux/iostat.in 2013-08-17 13:19:03.504395523 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/iostat.in 2013-08-17 13:18:51.994254767 +0200
+@@ -173,7 +173,7 @@
if ($tmpnam =~ /\d+$/ and !$include_numbered) {
# Special case for devices like cXdXpX,
# like the cciss driver
@@ -575,60 +817,107 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/iostat.in munin-1.3.4-p/plugins/node
}
next unless grep { $_ } @fields;
-diff -Naur munin-1.3.4/plugins/node.d.linux/load.in munin-1.3.4-p/plugins/node.d.linux/load.in
---- munin-1.3.4/plugins/node.d.linux/load.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d.linux/load.in Fri Apr 4 11:15:15 2008
-@@ -35,20 +35,20 @@
- # one machine answer for several)
-
- # The title of the graph
-- echo 'graph_title Load average'
-+ echo "graph_title Load average"
- # Arguments to "rrdtool graph". In this case, tell it that the
- # lower limit of the graph is '0', and that 1k=1000 (not 1024)
-- echo 'graph_args --base 1000 -l 0'
-+ echo "graph_args --base 1000 -l 0"
- # The Y-axis label
-- echo 'graph_vlabel load'
-+ echo "graph_vlabel load"
- # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
- # 420 milliload)
-- echo 'graph_scale no'
-+ echo "graph_scale no"
- # Graph category. Defaults to 'other'
-- echo 'graph_category system'
-+ echo "graph_category system"
- # The fields. "label" is used in the legend. "label" is the only
- # required subfield.
-- echo 'load.label load'
-+ echo "load.label load"
- # These two read the environment for warning values for the field
- # "load". If "load_warning" or "warning" aren't set in the
- # environment, no warning levels are set. Likewise for "load_critical"
-@@ -57,8 +57,8 @@
- # This one is purely to add an explanation to the web page. The first
- # one is for the graph itself, while the second one is for the field
- # "load".
-- echo 'graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run "immediately").'
-- echo 'load.info 5 minute load average'
-+ echo "graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run \"immediately\")."
-+ echo "load.info 5 minute load average"
-
- # Last, if run with the "config"-parameter, quit here (don't
- # display any data)
-diff -Naur munin-1.3.4/plugins/node.d.linux/nfs_client.in munin-1.3.4-p/plugins/node.d.linux/nfs_client.in
---- munin-1.3.4/plugins/node.d.linux/nfs_client.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d.linux/nfs_client.in Fri Apr 4 11:13:06 2008
-@@ -11,7 +11,7 @@
+diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/node.d.linux/ip_.in
+--- munin-2.0.17/plugins/node.d.linux/ip_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/ip_.in 2013-08-17 13:18:51.820919315 +0200
+@@ -127,14 +127,18 @@
+ # This is a fun hack to make the plugin ip6 compatible.
+ # Suggested in ticket #439 by "jodal".
+ eval 'iptables() {
+- ip6tables "$@"
++ /usr/sbin/ip6tables "$@"
++ }'
++ ;;
++ *) eval 'iptables() {
++ /usr/sbin/iptables "$@"
+ }'
+ ;;
+ esac
+
+ if [[ "$1" == "autoconf" ]]; then
+ if [[ -r /proc/net/dev ]]; then
+- if ! iptables -L ${INPUT} -v -n -x >/dev/null 2>/dev/null; then
++ if ! /usr/sbin/iptables -L ${INPUT} -v -n -x >/dev/null 2>/dev/null; then
+ echo "no (could not run iptables as user $(whoami))"
+ exit 0
+ else
+@@ -147,10 +151,10 @@
+ fi
+ fi
+
+-if [[ "$1" == "suggest" ]]; then
+- iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
+- if [[ -x /sbin/ip6tables ]]; then
+- ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
++if [ "$1" = "suggest" ]; then
++ /usr/sbin/iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
++ if [[ -x /usr/sbin/ip6tables ]]; then
++ /usr/sbin/ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
+ fi
+ exit 0
+ fi
+@@ -183,5 +187,5 @@
+
+ # Escape .'s so they don't match _everything_?
+ IP=$(echo $IP | sed 's~\.~\\.~g')
+-iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ /]/ { print "in.value " $2; exit 0; }'
+-iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ /]/ { print "out.value " $2; exit 0; }'
++/usr/sbin/iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ \/]/ { print "in.value " $2; exit 0; }'
++/usr/sbin/iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ \/]/ { print "out.value " $2; exit 0; }'
+diff -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins/node.d.linux/load.in
+--- munin-2.0.17/plugins/node.d.linux/load.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/load.in 2013-08-17 13:18:51.820919315 +0200
+@@ -59,20 +59,20 @@
+ # one machine answer for several)
+
+ # The title of the graph
+- echo 'graph_title Load average'
++ echo "graph_title Load average"
+ # Arguments to "rrdtool graph". In this case, tell it that the
+ # lower limit of the graph is '0', and that 1k=1000 (not 1024)
+- echo 'graph_args --base 1000 -l 0'
++ echo "graph_args --base 1000 -l 0"
+ # The Y-axis label
+- echo 'graph_vlabel load'
++ echo "graph_vlabel load"
+ # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of
+ # 420 milliload)
+- echo 'graph_scale no'
++ echo "graph_scale no"
+ # Graph category. Defaults to 'other'
+- echo 'graph_category system'
++ echo "graph_category system"
+ # The fields. "label" is used in the legend. "label" is the only
+ # required subfield.
+- echo 'load.label load'
++ echo "load.label load"
+ # These two read the environment for warning values for the field
+ # "load". If "load_warning" or "warning" aren't set in the
+ # environment, no warning levels are set. Likewise for "load_critical"
+@@ -82,8 +82,8 @@
+ # This one is purely to add an explanation to the web page. The first
+ # one is for the graph itself, while the second one is for the field
+ # "load".
+- echo 'graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run "immediately").'
+- echo 'load.info 5 minute load average'
++ echo "graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run \"immediately\")."
++ echo "load.info 5 minute load average"
+
+ # Last, if run with the "config"-parameter, quit here (don't
+ # display any data)
+diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in
+--- munin-2.0.17/plugins/node.d.linux/nfs_client.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in 2013-08-17 13:18:51.820919315 +0200
+@@ -31,7 +31,7 @@
proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
if [ "$1" = "autoconf" ]; then
-- if [ -x "$NFS" ]; then
+- if [ -f "$NFS" ]; then
+ if [ -r "$NFS" ]; then
echo yes
exit 0
else
-@@ -31,11 +31,66 @@
+@@ -51,11 +51,66 @@
exit 0
fi
@@ -702,10 +991,10 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfs_client.in munin-1.3.4-p/plugins/
+ print "commit.value " nfs_commit
}' $NFS
-
-diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d.linux/nfsd.in
---- munin-1.3.4/plugins/node.d.linux/nfsd.in Sat Mar 8 02:42:39 2008
-+++ munin-1.3.4-p/plugins/node.d.linux/nfsd.in Fri Apr 4 11:13:06 2008
-@@ -12,7 +12,7 @@
+diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in
+--- munin-2.0.17/plugins/node.d.linux/nfsd.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in 2013-08-17 13:18:51.820919315 +0200
+@@ -31,7 +31,7 @@
proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
if [ "$1" = "autoconf" ]; then
@@ -714,7 +1003,7 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
echo yes
exit 0
else
-@@ -32,9 +32,66 @@
+@@ -51,9 +51,66 @@
exit 0
fi
@@ -787,55 +1076,9 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
+ print "pathconf.value " nfs_pathconf
+ print "commit.value " nfs_commit
+}' $NFSD
---- munin-1.3.4/plugins/node.d.linux/ip_.in~ 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/plugins/node.d.linux/ip_.in 2008-05-20 13:00:17.000000000 +0200
-@@ -113,15 +113,19 @@
- *:*) # I know this! This is IPv6!
- # This is a fun hack to make the plugin ip6 compatible.
- # Suggested in ticket #439 by "jodal".
-- eval 'function iptables() {
-- /sbin/ip6tables "$@"
-+ eval 'iptables() {
-+ /usr/sbin/ip6tables "$@"
-+ }'
-+ ;;
-+ *) eval 'iptables() {
-+ /usr/sbin/iptables "$@"
- }'
- ;;
- esac
-
- if [ "$1" = "autoconf" ]; then
- if [ -r /proc/net/dev ]; then
-- iptables -L ${INPUT} -v -n -x >/dev/null 2>/dev/null
-+ /usr/sbin/iptables -L ${INPUT} -v -n -x >/dev/null 2>/dev/null
- if [ $? -gt 0 ]; then
- echo "no (could not run iptables as user `whoami`)"
- exit 0
-@@ -136,9 +140,9 @@
- fi
-
- if [ "$1" = "suggest" ]; then
-- iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
-- if [ -x /sbin/ip6tables ]; then
-- ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
-+ /usr/sbin/iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
-+ if [ -x /usr/sbin/ip6tables ]; then
-+ /usr/sbin/ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
- fi
- exit 0
- fi
-@@ -173,6 +177,5 @@
- # Escape .'s so they don't match _everything_?
- IP="$( echo $IP | sed 's~\.~\\.~g' )"
-
--iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ /]/ { print "in.value " $2; exit 0; }'
--
--iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ /]/ { print "out.value " $2; exit 0; }'
-+iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ \/]/ { print "in.value " $2; exit 0; }'
-+iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ \/]/ { print "out.value " $2; exit 0; }'
---- munin-1.3.4/plugins/node.d.linux/vlan_inetuse_.in~ 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/plugins/node.d.linux/vlan_inetuse_.in 2008-05-20 13:00:50.000000000 +0200
+diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in
+--- munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in 2013-08-17 13:18:51.820919315 +0200
@@ -37,8 +37,8 @@
my %in_octets = ();
my %out_octets = ();
@@ -870,8 +1113,9 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
if ($ARGV[0] and $ARGV[0] eq "config")
{
---- munin-1.3.4/plugins/node.d.linux/vlan_linkuse_.in~ 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/plugins/node.d.linux/vlan_linkuse_.in 2008-05-20 13:01:48.000000000 +0200
+diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in
+--- munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in 2013-08-17 13:18:51.820919315 +0200
@@ -29,8 +29,8 @@
my %in_octets = ();
my %out_octets = ();
@@ -904,124 +1148,10 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
-die "Error running iptables. Dying\n" if $?;
+die "Error running /usr/sbin/iptables. Dying\n" if $?;
# vim:syntax=perl
---- munin-1.3.4/plugins/node.d/amavis.in~ 2008-03-08 02:42:39.000000000 +0100
-+++ munin-1.3.4/plugins/node.d/amavis.in 2009-03-16 16:30:48.000000000 +0100
-@@ -59,8 +59,7 @@
-
-
- mktempfile () {
-- cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/`
-- $cmd
-+ mktemp -p /tmp/ $1
- }
-
- AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info}
-@@ -87,7 +87,7 @@
-
- if [ "$1" = "config" ]; then
- echo 'graph_title Amavis filter statistics'
-- echo 'graph_vlabel \#'
-+ echo 'graph_vlabel mails'
- echo 'graph_category antivirus'
- echo 'virus.label virus'
- echo 'virus.info Number of viruses caught in email'
-@@ -105,7 +105,7 @@
- spamm=U
- spams=U
-
--TEMP_FILE=$(mktempfile munin-amavis.XXXXXX)
-+TEMP_FILE=$(mktempfile munin-amavis.XXXXXXXXXX)
-
- if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]
- then
---- munin-1.3.4/plugins/node.d/hddtemp_smartctl.in. 2009-04-14 17:29:08.000000000 +0200
-+++ munin-1.3.4/plugins/node.d/hddtemp_smartctl.in 2008-03-08 02:42:39.000000000 +0100
-@@ -126,7 +126,7 @@
- } elsif ($ARGV[0] eq 'config') {
- print "graph_title HDD temperature\n";
- print "graph_args --base 1000 -l 0\n";
-- print "graph_vlabel temp in �C\n";
-+ print "graph_vlabel temp in °C\n";
- print "graph_category sensors\n";
- print "graph_info This graph shows the temperature in degrees Celsius of the hard drives in the machine.\n";
- print "$_.label $_\n" foreach @drives;
---- munin-1.4.0/plugins/node.d.linux/vserver_cpu_.in~ 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0/plugins/node.d.linux/vserver_cpu_.in 2009-11-30 23:37:51.904724363 +0100
-@@ -209,11 +209,11 @@
- NAME=`echo $LABEL | cut -d. -f1 | tr '-' '_'`
- echo -n "${NAME}_$j.value "
- if [ "$MODE" == "cpu" ] ; then
-- USERCPU=`cat /proc/virtual/$i/sched |grep "cpu $j"| cut -d' ' -f3`
-- SYSCPU=`cat /proc/virtual/$i/sched |grep "cpu $j"| cut -d' ' -f4`
-+ USERCPU=`cat /proc/virtual/$i/sched |grep "cpu $j:"| cut -d' ' -f3`
-+ SYSCPU=`cat /proc/virtual/$i/sched |grep "cpu $j:"| cut -d' ' -f4`
- echo $[$USERCPU + $SYSCPU]
- else
-- cat /proc/virtual/$i/sched |grep "cpu $j"| cut -d' ' -f5
-+ cat /proc/virtual/$i/sched |grep "cpu $j:"| cut -d' ' -f5
- fi
- fi
- done
---- munin-1.4.0/plugins/node.d/amavis.in~ 2009-11-30 22:51:19.559661327 +0100
-+++ munin-1.4.0/plugins/node.d/amavis.in 2009-11-30 23:58:17.188697242 +0100
-@@ -81,7 +81,7 @@
-
- AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info}
- LOGTAIL=${logtail:-logtail}
--STATEFILE=$MUNIN_PLUGSTATE/amavis.offset
-+STATEFILE=@@PLUGSTATE@@/amavis.offset
-
- if [ "$1" = "autoconf" ]; then
- if [ -f "${AMAVIS_LOG}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then
---- munin-1.4.0/plugins/node.d/bind9.in~ 2009-11-30 22:51:19.454661434 +0100
-+++ munin-1.4.0/plugins/node.d/bind9.in 2009-11-30 23:58:58.897786717 +0100
-@@ -33,7 +33,7 @@
- use strict;
-
- my $QUERYLOG = $ENV{logfile} || '/var/log/bind9/query.log';
--my $STATEFILE= $ENV{MUNIN_PLUGSTATE}.'/bind9.state';
-+my $STATEFILE= "@@PLUGSTATE@@/bind9.state";
- my $OTHER=0;
- my %IN;
-
---- munin-1.4.0/plugins/node.d/foldingathome_rank.in~ 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0/plugins/node.d/foldingathome_rank.in 2009-12-01 00:00:55.992661939 +0100
-@@ -13,7 +13,7 @@
- #%# family=contrib
- #%# capabilities=autoconf
-
--statefile=$MUNIN_PLUGSTATE/plugin-fah_rank.state
-+statefile=@@PLUGSTATE@@/plugin-fah_rank.state
-
- if [ "$1" = "autoconf" ]; then
- # No real check of anything
---- munin-1.4.0/plugins/node.d.linux/files_.in~ 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0/plugins/node.d.linux/files_.in 2009-12-01 00:03:16.224727207 +0100
-@@ -14,7 +14,7 @@
- #%# capabilities=autoconf
-
- PROC=${0##*/files_}
--TMPFILE="$MUNIN_PLUGSTATE/munin-files_${PROC}.state"
-+TMPFILE="@@PLUGSTATE@@/munin-files_${PROC}.state"
-
- if [ "$1" = "autoconf" ]; then
- if [ -x /usr/sbin/lsof ]; then
---- munin-1.4.0/plugins/node.d/slapd_.in~ 2009-11-27 12:17:11.000000000 +0100
-+++ munin-1.4.0/plugins/node.d/slapd_.in 2009-12-01 23:43:43.736623052 +0100
-@@ -36,8 +36,8 @@
-
- # Change these to reflect your LDAP ACL. The given DN must have
- # read access to the Monitor branch.
--my $basedn = "cn=Monitor";
--my $server = "localhost";
-+my $basedn = ($ENV{'basedn'} || "cn=Monitor");
-+my $server = ($ENV{'server'} || "localhost");
- my $userdn = ($ENV{'binddn'} || '');
- my $userpw = ($ENV{'bindpw'} || '');
-
---- munin/plugins/node.d.linux/vserver_resources.in~ 2008-11-28 18:36:22.000000000 +0100
-+++ munin/plugins/node.d.linux/vserver_resources.in 2008-11-29 01:39:40.000000000 +0100
-@@ -188,6 +188,12 @@
+diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in
+--- munin-2.0.17/plugins/node.d.linux/vserver_resources.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in 2013-08-17 13:18:51.820919315 +0200
+@@ -245,6 +245,12 @@
echo 'graph_vlabel ANON pages'
echo 'graph_info Shows anonymous memory (human readable) used by each vserver.'
;;
@@ -1034,7 +1164,7 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
FILES)
echo 'graph_title Files used by vserver'
echo 'graph_args --base 1024k -l 0'
-@@ -224,6 +230,30 @@
+@@ -281,6 +287,30 @@
echo 'graph_vlabel SHM pages'
echo 'graph_info Shows shared memory (human readable) used by each vserver.'
;;
@@ -1065,7 +1195,7 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
*)
echo "$RESOURCE not defined."
exit 1
-@@ -242,53 +272,108 @@
+@@ -299,53 +329,108 @@
case "$RESOURCE" in
PROC)
@@ -1201,7 +1331,7 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
;;
*)
echo "$RESOURCE not defined."
-@@ -299,7 +384,7 @@
+@@ -356,7 +441,7 @@
if [ ! -z "$LIMITS" -a "$LIMITS" = 1 ]; then
LIMIT=`cat /proc/virtual/$xid/limit | grep $RESOURCE | cut -f4`
if [ ${LIMIT:-0} -gt 0 ]; then
@@ -1210,7 +1340,7 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
fi
fi
done
-@@ -310,8 +395,15 @@
+@@ -367,8 +452,15 @@
for xid in $XIDS ; do
LABEL=`cat /proc/virtual/$xid/$NAMELOC |grep NodeName |cut -f2`
NAME=`echo $LABEL | cut -d. -f1 | tr '-' '_'`
@@ -1230,145 +1360,3 @@ diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d
+ fi
done
-
---- munin-1.4.0/plugins/node.d/ntp_offset.in~ 2009-11-27 12:17:11.000000000 +0100
-+++ munin-1.4.0/plugins/node.d/ntp_offset.in 2009-12-16 13:28:05.942149904 +0100
-@@ -38,9 +38,9 @@
- =cut
-
- do_autoconf () {
-- ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
-+ /usr/sbin/ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
-
-- case "$(ntpq -n -p 2>/dev/null | wc -l)" in
-+ case "$(/usr/sbin/ntpq -n -p 2>/dev/null | wc -l)" in
- 0)
- echo 'no (unable to list peers)'
- exit 0
-@@ -57,7 +57,7 @@
- }
-
- do_config () {
-- syspeer="$(ntpq -n -p | grep '^[*o]')"
-+ syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
-
- set - $syspeer
-
-@@ -89,7 +89,7 @@
-
- do_ () {
- # Fetch operation
-- syspeer="$(ntpq -n -p | grep '^[*o]')"
-+ syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
-
- set - $syspeer
-
---- munin-1.4.0/plugins/node.d/ntp_kernel_err.in~ 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0/plugins/node.d/ntp_kernel_err.in 2009-12-16 13:29:00.494146341 +0100
-@@ -33,7 +33,7 @@
-
- if [ "$1" = "autoconf" ]; then
- # Not all ntpdc's are equal
-- ntpdc -c kern 2>/dev/null |
-+ /usr/sbin/ntpdc -c kern 2>/dev/null |
- awk 'BEGIN { ev=1; }
- /^estimated error:/ { ev=0; }
- END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,4 +51,4 @@
- fi
-
- echo -n 'ntp_err.value '
--ntpdc -c kern | awk '/^estimated error:/ { print $3 }'
-+/usr/sbin/ntpdc -c kern | awk '/^estimated error:/ { print $3 }'
---- munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in~ 2009-12-15 20:45:10.715504269 +0100
-+++ munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in 2009-12-16 13:29:26.464147058 +0100
-@@ -39,7 +39,7 @@
- # $Id$
-
- if [ "$1" = "autoconf" ]; then
-- ntpdc -c kern 2>/dev/null |
-+ /usr/sbin/ntpdc -c kern 2>/dev/null |
- awk 'BEGIN { ev=1; }
- /^pll frequency:/ { ev=0; }
- END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -64,4 +64,4 @@
- fi
-
- echo -n 'ntp_pll_freq.value '
--ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
-+/usr/sbin/ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
---- munin-1.4.0/plugins/node.d/ntp_kernel_pll_off.in~ 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0/plugins/node.d/ntp_kernel_pll_off.in 2009-12-16 13:29:45.228087885 +0100
-@@ -32,7 +32,7 @@
- # $Id$
-
- if [ "$1" = "autoconf" ]; then
-- ntpdc -c kern 2>/dev/null |
-+ /usr/sbin/ntpdc -c kern 2>/dev/null |
- awk 'BEGIN { ev=1; }
- /^pll offset:/ { ev=0; }
- END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -50,4 +50,4 @@
- fi
-
- echo -n 'ntp_pll_off.value '
--ntpdc -c kern | awk '/^pll offset:/ { print $3 }'
-+/usr/sbin/ntpdc -c kern | awk '/^pll offset:/ { print $3 }'
---- munin-1.4.3/plugins/node.d/mysql_.in~ 2009-12-30 13:55:55.000000000 +0100
-+++ munin-1.4.3/plugins/node.d/mysql_.in 2010-02-02 11:54:49.990957765 +0100
-@@ -34,6 +34,7 @@
- env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=3306
- env.mysqluser root
- env.mysqlpassword geheim
-+ env.mysqlnosuperpriv 1
-
-
- =head1 DEPENDENCIES
-@@ -133,6 +134,7 @@
- 'dsn' => $ENV{'mysqlconnection'} || 'DBI:mysql:mysql',
- 'user' => $ENV{'mysqluser'} || 'root',
- 'password' => $ENV{'mysqlpassword'} || '',
-+ 'nosuper' => $ENV{'mysqlnosuperpriv'} || 0,
- );
-
-
-@@ -900,8 +902,10 @@
-
- update_variables($dbh);
- update_innodb($dbh);
-- update_master($dbh);
-- update_slave($dbh);
-+ if (!$config{nosuper}) {
-+ update_master($dbh);
-+ update_slave($dbh);
-+ }
-
- $shared_memory_cache->set('data', $data);
- }
---- munin-1.4.3/plugins/node.d/mysql_innodb.in~ 2010-02-02 11:45:17.943837759 +0100
-+++ munin-1.4.3/plugins/node.d/mysql_innodb.in 2010-02-02 12:03:04.019832112 +0100
-@@ -1,4 +1,4 @@
--#!@@GOODSH@@
-+#!@@BASH@@
-
- : << =cut
-
---- munin-1.4.3/plugins/node.d/postgres_tuples_.in~ 2009-12-30 13:55:55.000000000 +0100
-+++ munin-1.4.3/plugins/node.d/postgres_tuples_.in 2010-02-02 14:45:43.592833166 +0100
-@@ -74,7 +74,6 @@
- . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables",
- ],
- ],
-- paramdatabase => 1,
- pivotquery => 1,
- configquery => [
- "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted'),"
---- munin-1.4.3/plugins/node.d/postgres_scans_.in~ 2009-12-30 13:55:55.000000000 +0100
-+++ munin-1.4.3/plugins/node.d/postgres_scans_.in 2010-02-02 14:46:06.139957913 +0100
-@@ -65,7 +65,6 @@
- vlabel => 'Scans / sec',
- basequery =>
- "SELECT COALESCE(sum(seq_scan),0) AS sequential, COALESCE(sum(idx_scan),0) AS index FROM pg_stat_user_tables",
-- paramdatabase => 1,
- pivotquery => 1,
- configquery =>
- "VALUES ('sequential','Sequential scans'), ('index','Index scans')",
diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch
index 966fd26..e5da670 100644
--- a/munin-separate-configs.patch
+++ b/munin-separate-configs.patch
@@ -1,6 +1,6 @@
-diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.configs/common/lib/Munin/Common/Defaults.pm
---- munin-1.4.0/common/lib/Munin/Common/Defaults.pm 2009-11-30 17:45:38.228724308 +0100
-+++ munin-1.4.0.configs/common/lib/Munin/Common/Defaults.pm 2009-11-30 17:36:32.000000000 +0100
+diff -ur munin-2.0.17/common/lib/Munin/Common/Defaults.pm munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.17/common/lib/Munin/Common/Defaults.pm 2013-08-17 12:26:06.386624187 +0200
++++ munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm 2013-08-17 12:19:22.386149494 +0200
@@ -18,7 +18,8 @@
our $DROPDOWNLIMIT = 1;
@@ -11,10 +11,32 @@ diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.configs/com
our $MUNIN_BINDIR = '';
our $MUNIN_SBINDIR = '';
our $MUNIN_DOCDIR = '';
-diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
---- munin-1.4.0/Makefile 2009-11-30 17:45:38.231724115 +0100
-+++ munin-1.4.0.configs/Makefile 2009-11-30 17:23:36.000000000 +0100
-@@ -50,7 +50,7 @@
+Only in munin-2.0.17/common/lib/Munin/Common: Defaults.pm.orig
+diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/installation/configuration.rst
+--- munin-2.0.17/doc/installation/configuration.rst 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/doc/installation/configuration.rst 2013-08-17 12:23:16.773630125 +0200
+@@ -9,7 +9,7 @@
+ -------
+
+ Decide which plugins to use. The munin node runs all plugins present
+-in CONFDIR/plugins/
++in NCONFDIR/plugins/
+
+ The quick auto-plug-and-play solution:
+
+@@ -59,7 +59,7 @@
+ Add some nodes
+ --------------
+
+-Add some nodes to CONFDIR/munin.conf
++Add some nodes to MCONFDIR/munin.conf
+
+ [node.example.com]
+ address 192.0.2.4
+diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
+--- munin-2.0.17/Makefile 2013-08-17 12:26:06.386624187 +0200
++++ munin-2.0.17-sep/Makefile 2013-08-17 12:19:22.386149494 +0200
+@@ -56,7 +56,7 @@
# a new config. Target _only_ suitable for maintainers.
unconfig:
rm -f $(HTMLDIR)/.htaccess
@@ -23,25 +45,26 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
tags:
-rm -f TAGS
-@@ -68,13 +68,14 @@
- @$(CHECKUSER)
+@@ -71,14 +71,15 @@
mkdir -p $(LOGDIR)
mkdir -p $(STATEDIR)
+ mkdir -p $(SPOOLDIR)
- mkdir -p $(CONFDIR)
+ mkdir -p $(NCONFDIR)
+ mkdir -p $(MCONFDIR)
- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
+ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
install-master-prime: $(INFILES_MASTER) install-pre install-master
mkdir -p $(TEMPLATEDIR)
+ mkdir -p $(TEMPLATEDIR)/static
mkdir -p $(TEMPLATEDIR)/partial
- mkdir -p $(CONFDIR)/munin-conf.d
+ mkdir -p $(MCONFDIR)/munin-conf.d
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
mkdir -p $(SBINDIR)
-@@ -98,7 +99,7 @@
- $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/
+@@ -111,7 +112,7 @@
+ $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
@@ -49,7 +72,7 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
$(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
$(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
-@@ -121,14 +122,14 @@
+@@ -140,14 +141,14 @@
install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
@$(CHECKGROUP)
@@ -60,14 +83,14 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
mkdir -p $(LIBDIR)/plugins
mkdir -p $(PLUGSTATE)
- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
- $(CHMOD) 0775 $(PLUGSTATE)
+ $(CHOWN) root:root $(PLUGSTATE)
+ $(CHMOD) 0755 $(PLUGSTATE)
- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+ $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d
for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
if test -f "$$p" ; then \
-@@ -151,7 +152,7 @@
+@@ -184,7 +185,7 @@
install-node-prime: install-node-pre install-node
install-node-pre: build/node/munin-node.conf install-pre
@@ -76,7 +99,7 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
install-common-prime: build-common install-common
-@@ -188,7 +189,8 @@
+@@ -220,7 +221,8 @@
@echo "$< -> $@"
@mkdir -p build/`dirname $<`
@sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
@@ -86,9 +109,9 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
-e 's|@@BINDIR@@|$(BINDIR)|g' \
-e 's|@@SBINDIR@@|$(SBINDIR)|g' \
-e 's|@@DOCDIR@@|$(DOCDIR)|g' \
-@@ -229,7 +231,8 @@
-
+@@ -261,7 +263,8 @@
common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre
+ rm -f common/blib/lib/Munin/Common/Defaults.pm
$(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \
- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \
+ s{(MCONFDIR \s+=\s).*}{\1q{$(MCONFDIR)};}x; \
@@ -96,7 +119,7 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \
s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \
s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \
-@@ -373,7 +376,7 @@
+@@ -388,7 +391,7 @@
$(MAKE) $@ CONFIG=t/Makefile.config
else
test_plugins = id_default id_root env
@@ -105,7 +128,7 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
@for test in t/*.t; do \
echo -n "$$test: "; \
PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-@@ -381,10 +384,10 @@
+@@ -396,10 +399,10 @@
endif
node-monkeywrench: install-node
@@ -118,9 +141,9 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.configs/Makefile
cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
$(SBINDIR)/munin-node-configure --suggest
echo 'Done?'
-diff -ur munin-1.4.0/Makefile.config munin-1.4.0.configs/Makefile.config
---- munin-1.4.0/Makefile.config 2009-11-30 17:45:38.234724358 +0100
-+++ munin-1.4.0.configs/Makefile.config 2009-11-30 17:22:04.000000000 +0100
+diff -ur munin-2.0.17/Makefile.config munin-2.0.17-sep/Makefile.config
+--- munin-2.0.17/Makefile.config 2013-08-17 12:26:06.386624187 +0200
++++ munin-2.0.17-sep/Makefile.config 2013-08-17 12:19:22.386149494 +0200
@@ -20,7 +20,8 @@
PREFIX = $(DESTDIR)/usr
@@ -131,22 +154,24 @@ diff -ur munin-1.4.0/Makefile.config munin-1.4.0.configs/Makefile.config
# Server only - where to put munin-cron
BINDIR = $(PREFIX)/bin
-diff -ur munin-1.4.0/master/_bin/munin-cgi-graph.in munin-1.4.0.configs/master/_bin/munin-cgi-graph.in
---- munin-1.4.0/master/_bin/munin-cgi-graph.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-cgi-graph.in 2009-11-30 17:24:36.000000000 +0100
-@@ -32,7 +32,7 @@
- use IPC::SysV qw(IPC_CREAT);
+Only in munin-2.0.17: Makefile.config.orig
+Only in munin-2.0.17: Makefile.orig
+diff -ur munin-2.0.17/master/_bin/munin-cgi-graph.in munin-2.0.17-sep/master/_bin/munin-cgi-graph.in
+--- munin-2.0.17/master/_bin/munin-cgi-graph.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/_bin/munin-cgi-graph.in 2013-08-17 12:19:22.386149494 +0200
+@@ -44,7 +44,7 @@
+ use Log::Log4perl qw( :easy );
my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
+my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
- my %TIMES = ( "day" => ["--noweek", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"],
- "week" => ["--noday", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"],
-diff -ur munin-1.4.0/master/_bin/munin-check.in munin-1.4.0.configs/master/_bin/munin-check.in
---- munin-1.4.0/master/_bin/munin-check.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-check.in 2009-11-30 17:24:54.000000000 +0100
-@@ -166,7 +166,7 @@
+ my %period = ( "day" => 300,
+ "week" => 1800,
+diff -ur munin-2.0.17/master/_bin/munin-check.in munin-2.0.17-sep/master/_bin/munin-check.in
+--- munin-2.0.17/master/_bin/munin-check.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/_bin/munin-check.in 2013-08-17 12:19:22.386149494 +0200
+@@ -163,7 +163,7 @@
norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
norec=yes perm_ok @@PLUGSTATE@@ 775
@@ -155,120 +180,31 @@ diff -ur munin-1.4.0/master/_bin/munin-check.in munin-1.4.0.configs/master/_bin/
echo "Check done. Please note that this script only checks most things,"
echo "not all things."
-diff -ur munin-1.4.0/master/_bin/munin-fastcgi-graph.in munin-1.4.0.configs/master/_bin/munin-fastcgi-graph.in
---- munin-1.4.0/master/_bin/munin-fastcgi-graph.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-fastcgi-graph.in 2009-11-30 17:25:36.000000000 +0100
-@@ -32,7 +32,7 @@
- use CGI::Fast;
+diff -ur munin-2.0.17/master/_bin/munin-graph.in munin-2.0.17-sep/master/_bin/munin-graph.in
+--- munin-2.0.17/master/_bin/munin-graph.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/_bin/munin-graph.in 2013-08-17 12:19:22.386149494 +0200
+@@ -51,7 +51,7 @@
+ use Log::Log4perl qw( :easy );
my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
+my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
- my %TIMES = ( "day" => ["--noweek", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"],
- "week" => ["--noday", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"],
-diff -ur munin-1.4.0/master/_bin/munin-gather.in munin-1.4.0.configs/master/_bin/munin-gather.in
---- munin-1.4.0/master/_bin/munin-gather.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-gather.in 2009-11-30 17:26:10.000000000 +0100
-@@ -40,7 +40,7 @@
- my $MDEBUG = 0;
- my $VERSION = "@@VERSION@@";
- my $serversocket = "munin-server-socket.$$";
--my $conffile = "@@CONFDIR@@/munin.conf";
-+my $conffile = "@@MCONFDIR@@/munin.conf";
- my $force_root = 0;
- my $do_usage = 0;
- my @limit_hosts = ();
-@@ -84,7 +84,7 @@
- --host <host> Limit graphed hosts to <host>. Multiple --host options
- may be supplied.
- --config <file> Use <file> as configuration file.
-- [@@CONFDIR@@/munin.conf]
-+ [@@MCONFDIR@@/munin.conf]
- --log <level> Set log level: DEBUG|INFO|WARN|ERROR|FATAL.
- These levels work the same way as in syslog.
- --[no]debug Send debug messages both to the log and to the screen
-@@ -827,13 +827,13 @@
- my $tls_verify;
-
- $key = $cert = munin_get( $config, "tls_pem" );
-- $key = &munin_get( $config, "tls_private_key", "@@CONFDIR@@/munin.pem" )
-+ $key = &munin_get( $config, "tls_private_key", "@@MCONFDIR@@/munin.pem" )
- unless defined $key;
- $cert =
-- &munin_get( $config, "tls_certificate", "@@CONFDIR@@/munin.pem" )
-+ &munin_get( $config, "tls_certificate", "@@MCONFDIR@@/munin.pem" )
- unless defined $cert;
- $ca_cert =
-- &munin_get( $config, "tls_ca_certificate", "@@CONFDIR@@/cacert.pem" )
-+ &munin_get( $config, "tls_ca_certificate", "@@MCONFDIR@@/cacert.pem" )
- unless defined $ca_cert;
- $tls_verify = &munin_get( $config, "tls_verify_certificate", "no" );
- $depth = &munin_get( $config, "tls_verify_depth", 5 );
-@@ -919,7 +919,7 @@
-
- =item B<< --config <file> >>
-
--Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
-+Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
-
- =item B<< --help >>
-
-@@ -959,7 +959,7 @@
-
- =head1 FILES
-
-- @@CONFDIR@@/munin.conf
-+ @@MCONFDIR@@/munin.conf
- @@DBDIR@@/*
- @@LOGDIR@@/munin-update
- @@STATEDIR@@/*
-diff -ur munin-1.4.0/master/_bin/munin-graph.in munin-1.4.0.configs/master/_bin/munin-graph.in
---- munin-1.4.0/master/_bin/munin-graph.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-graph.in 2009-11-30 17:26:27.000000000 +0100
-@@ -92,7 +92,7 @@
-
- =item B<< --config <file> >>
-
--Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
-+Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
-
- =item B<< --[no]list-images >>
-
-@@ -135,7 +135,7 @@
-
- =head1 FILES
-
-- @@CONFDIR@@/munin.conf
-+ @@MCONFDIR@@/munin.conf
- @@DBDIR@@/*
- @@LOGDIR@@/munin-graph
- @@STATEDIR@@/*
-diff -ur munin-1.4.0/master/_bin/munin-html.in munin-1.4.0.configs/master/_bin/munin-html.in
---- munin-1.4.0/master/_bin/munin-html.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-html.in 2009-11-30 17:26:34.000000000 +0100
-@@ -90,7 +90,7 @@
-
- =head1 FILES
-
-- @@CONFDIR@@/munin.conf
-+ @@MCONFDIR@@/munin.conf
- @@DBDIR@@/datafile
- @@LOGDIR@@/munin-html
- @@HTMLDIR@@/*
-diff -ur munin-1.4.0/master/_bin/munin-limits.in munin-1.4.0.configs/master/_bin/munin-limits.in
---- munin-1.4.0/master/_bin/munin-limits.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-limits.in 2009-11-30 17:26:41.000000000 +0100
-@@ -64,7 +64,7 @@
+ my %period = ( "day" => 300,
+ "week" => 1800,
+diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/munin-limits.in
+--- munin-2.0.17/master/_bin/munin-limits.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/_bin/munin-limits.in 2013-08-17 12:19:22.386149494 +0200
+@@ -66,7 +66,7 @@
=item B<< --config <file> >>
-Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
+Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
- =item B<< --[no]force >>
+ =item B<< --always-send <severity list> >>
-@@ -100,7 +100,7 @@
+@@ -114,7 +114,7 @@
=head1 FILES
@@ -277,10 +213,10 @@ diff -ur munin-1.4.0/master/_bin/munin-limits.in munin-1.4.0.configs/master/_bin
@@DBDIR@@/*
@@STATEDIR@@/*
-diff -ur munin-1.4.0/master/_bin/munin-update.in munin-1.4.0.configs/master/_bin/munin-update.in
---- munin-1.4.0/master/_bin/munin-update.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/_bin/munin-update.in 2009-11-30 17:26:56.000000000 +0100
-@@ -137,7 +137,7 @@
+diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/munin-update.in
+--- munin-2.0.17/master/_bin/munin-update.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/_bin/munin-update.in 2013-08-17 12:19:22.386149494 +0200
+@@ -139,7 +139,7 @@
=item B<< --config_file=<file> >>
@@ -289,7 +225,7 @@ diff -ur munin-1.4.0/master/_bin/munin-update.in munin-1.4.0.configs/master/_bin
=item B<< --[no]debug >>
-@@ -190,7 +190,7 @@
+@@ -192,7 +192,7 @@
=head1 FILES
@@ -298,10 +234,10 @@ diff -ur munin-1.4.0/master/_bin/munin-update.in munin-1.4.0.configs/master/_bin
@@DBDIR@@/*
@@LOGDIR@@/munin-update
@@STATEDIR@@/*
-diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.configs/master/doc/munin.conf.pod.in
---- munin-1.4.0/master/doc/munin.conf.pod.in 2009-11-30 17:45:38.237723844 +0100
-+++ munin-1.4.0.configs/master/doc/munin.conf.pod.in 2009-11-30 17:31:11.000000000 +0100
-@@ -25,7 +25,7 @@
+diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/munin.conf.pod.in
+--- munin-2.0.17/master/doc/munin.conf.pod.in 2013-08-17 12:26:06.386624187 +0200
++++ munin-2.0.17-sep/master/doc/munin.conf.pod.in 2013-08-17 12:19:22.386149494 +0200
+@@ -27,7 +27,7 @@
[machine1.your.dom]
address localhost
@@ -310,7 +246,7 @@ diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.configs/master/doc
If your placement deviates from this norm, use the "--config
E<lt>fileE<gt>"-option when running the munin-* programs.
-@@ -153,20 +153,20 @@
+@@ -149,20 +149,20 @@
=item B<tls_private_key> <value>
This directive sets the location of the private key to be used for
@@ -334,10 +270,11 @@ diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.configs/master/doc
=item B<tls_verify_depth> <value>
-diff -ur munin-1.4.0/master/doc/munin-cron.pod.in munin-1.4.0.configs/master/doc/munin-cron.pod.in
---- munin-1.4.0/master/doc/munin-cron.pod.in 2009-11-27 12:17:16.000000000 +0100
-+++ munin-1.4.0.configs/master/doc/munin-cron.pod.in 2009-11-30 17:31:17.000000000 +0100
-@@ -20,7 +20,7 @@
+Only in munin-2.0.17/master/doc: munin.conf.pod.in.orig
+diff -ur munin-2.0.17/master/doc/munin-cron.pod.in munin-2.0.17-sep/master/doc/munin-cron.pod.in
+--- munin-2.0.17/master/doc/munin-cron.pod.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/doc/munin-cron.pod.in 2013-08-17 12:19:22.386149494 +0200
+@@ -22,7 +22,7 @@
=item B<< --config <file> >>
@@ -346,9 +283,9 @@ diff -ur munin-1.4.0/master/doc/munin-cron.pod.in munin-1.4.0.configs/master/doc
=back
-diff -ur munin-1.4.0/master/extras/munin-update_old.in munin-1.4.0.configs/master/extras/munin-update_old.in
---- munin-1.4.0/master/extras/munin-update_old.in 2009-11-27 12:17:17.000000000 +0100
-+++ munin-1.4.0.configs/master/extras/munin-update_old.in 2009-11-30 17:31:58.000000000 +0100
+diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/extras/munin-update_old.in
+--- munin-2.0.17/master/extras/munin-update_old.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/extras/munin-update_old.in 2013-08-17 12:19:22.386149494 +0200
@@ -43,7 +43,7 @@
my $STATS;
my $cli_do_fork;
@@ -358,7 +295,7 @@ diff -ur munin-1.4.0/master/extras/munin-update_old.in munin-1.4.0.configs/maste
my $config;
my $do_fork = 1;
my $serversocket = "munin-server-socket.$$";
-@@ -161,7 +161,7 @@
+@@ -159,7 +159,7 @@
--host <host> Limit graphed hosts to <host>. Multiple --host options
may be supplied.
--config <file> Use <file> as configuration file.
@@ -367,7 +304,7 @@ diff -ur munin-1.4.0/master/extras/munin-update_old.in munin-1.4.0.configs/maste
--[no]debug View debug messages. [--nodebug]
--[no]fork Don't fork one instance for each host. [--fork]
--timeout=<seconds> TCP timeout when talking to clients. [$timeout]
-@@ -754,11 +754,11 @@
+@@ -752,11 +752,11 @@
my $ca_cert;
my $tls_verify;
$key = $cert = munin_get ($config, "tls_pem");
@@ -382,7 +319,7 @@ diff -ur munin-1.4.0/master/extras/munin-update_old.in munin-1.4.0.configs/maste
unless defined $ca_cert;
$tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
$depth=&munin_get ($config, "tls_verify_depth", 5);
-@@ -1090,7 +1090,7 @@
+@@ -1088,7 +1088,7 @@
=item B<< --config <file> >>
@@ -391,7 +328,7 @@ diff -ur munin-1.4.0/master/extras/munin-update_old.in munin-1.4.0.configs/maste
=item B<< --help >>
-@@ -1126,7 +1126,7 @@
+@@ -1124,7 +1124,7 @@
=head1 FILES
@@ -400,9 +337,9 @@ diff -ur munin-1.4.0/master/extras/munin-update_old.in munin-1.4.0.configs/maste
@@DBDIR@@/*
@@LOGDIR@@/munin-update
@@STATEDIR@@/*
-diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.configs/master/lib/Munin/Master/Config.pm
---- munin-1.4.0/master/lib/Munin/Master/Config.pm 2009-11-30 17:45:38.241724215 +0100
-+++ munin-1.4.0.configs/master/lib/Munin/Master/Config.pm 2009-11-30 17:28:11.000000000 +0100
+diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/lib/Munin/Master/Config.pm
+--- munin-2.0.17/master/lib/Munin/Master/Config.pm 2013-08-17 12:26:06.476625774 +0200
++++ munin-2.0.17-sep/master/lib/Munin/Master/Config.pm 2013-08-17 12:19:22.386149494 +0200
@@ -139,7 +139,7 @@
root_instance => 1,
@@ -412,8 +349,8 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.configs/maste
dbdir => $Munin::Common::Defaults::MUNIN_DBDIR,
debug => 0,
fork => 1,
-@@ -151,9 +151,9 @@
- rundir => '/tmp',
+@@ -153,9 +153,9 @@
+ rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
timeout => 180,
tls => 'disabled',
- tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
@@ -424,23 +361,24 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.configs/maste
+ tls_private_key => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
tls_verify_certificate => 0,
tls_verify_depth => 5,
- tmpldir => $Munin::Common::Defaults::MUNIN_TEMPLATEDIR,
-diff -ur munin-1.4.0/master/lib/Munin/Master/GraphOld.pm munin-1.4.0.configs/master/lib/Munin/Master/GraphOld.pm
---- munin-1.4.0/master/lib/Munin/Master/GraphOld.pm 2009-11-27 12:17:17.000000000 +0100
-+++ munin-1.4.0.configs/master/lib/Munin/Master/GraphOld.pm 2009-11-30 17:28:20.000000000 +0100
-@@ -89,7 +89,7 @@
- my $skip_locking = 0;
+ tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
+Only in munin-2.0.17/master/lib/Munin/Master: Config.pm.orig
+diff -ur munin-2.0.17/master/lib/Munin/Master/GraphOld.pm munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm
+--- munin-2.0.17/master/lib/Munin/Master/GraphOld.pm 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm 2013-08-17 12:19:22.386149494 +0200
+@@ -90,7 +90,7 @@
my $skip_stats = 0;
my $stdout = 0;
+ my $force_run_as_root = 0;
-my $conffile = $Munin::Common::Defaults::MUNIN_CONFDIR . "/munin.conf";
+my $conffile = $Munin::Common::Defaults::MUNIN_MCONFDIR . "/munin.conf";
my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR;
- my %draw = (
- "day" => 1,
-diff -ur munin-1.4.0/master/lib/Munin/Master/HTMLOld.pm munin-1.4.0.configs/master/lib/Munin/Master/HTMLOld.pm
---- munin-1.4.0/master/lib/Munin/Master/HTMLOld.pm 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/lib/Munin/Master/HTMLOld.pm 2009-11-30 17:30:13.000000000 +0100
-@@ -77,7 +77,7 @@
+ # Note: Nothing by default is more convenient and elliminates code while
+ # for cgi graphing - but it breaks how munin-graph expected stuff to work.
+diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm
+--- munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm 2013-08-17 12:19:22.389482886 +0200
+@@ -81,7 +81,7 @@
my @times = ("day", "week", "month", "year");
my $DEBUG = 0;
@@ -449,16 +387,16 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/HTMLOld.pm munin-1.4.0.configs/mast
my $do_usage = 0;
my $do_version = 0;
my $stdout = 0;
-@@ -1068,7 +1068,7 @@
- --service <service> Compatability. No effect.
- --host <host> Compatability. No effect.
+@@ -857,7 +857,7 @@
+ --service <service> Compatibility. No effect.
+ --host <host> Compatibility. No effect.
--config <file> Use <file> as configuration file.
- [/etc/munin/munin.conf]
+ [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
";
exit 0;
-@@ -1103,7 +1103,7 @@
+@@ -892,7 +892,7 @@
=item B<< --config <file> >>
@@ -467,7 +405,7 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/HTMLOld.pm munin-1.4.0.configs/mast
=item B<< --help >>
-@@ -1130,7 +1130,7 @@
+@@ -915,7 +915,7 @@
=head1 FILES
@@ -476,10 +414,10 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/HTMLOld.pm munin-1.4.0.configs/mast
@@DBDIR@@/datafile
@@LOGDIR@@/munin-html
@@HTMLDIR@@/*
-diff -ur munin-1.4.0/master/lib/Munin/Master/LimitsOld.pm munin-1.4.0.configs/master/lib/Munin/Master/LimitsOld.pm
---- munin-1.4.0/master/lib/Munin/Master/LimitsOld.pm 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/master/lib/Munin/Master/LimitsOld.pm 2009-11-30 17:29:45.000000000 +0100
-@@ -53,7 +53,7 @@
+diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm
+--- munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm 2013-08-17 12:19:22.389482886 +0200
+@@ -52,7 +52,7 @@
use Munin::Common::Defaults;
my $DEBUG = 0;
@@ -488,7 +426,7 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/LimitsOld.pm munin-1.4.0.configs/ma
my $do_usage = 0;
my $do_version = 0;
my @limit_hosts = ();
-@@ -199,7 +199,7 @@
+@@ -230,7 +230,7 @@
--contact <contact> Limit notified contacts to <contact>. Multiple
--contact options may be supplied.
--config <file> Use <file> as configuration file.
@@ -497,33 +435,48 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/LimitsOld.pm munin-1.4.0.configs/ma
";
exit 0;
-diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.configs/master/lib/Munin/Master/Utils.pm
---- munin-1.4.0/master/lib/Munin/Master/Utils.pm 2009-11-30 17:45:38.244724521 +0100
-+++ munin-1.4.0.configs/master/lib/Munin/Master/Utils.pm 2009-11-30 17:29:03.000000000 +0100
-@@ -78,7 +78,7 @@
- my $nsca = new IO::Handle;
- my $config = undef;
+Only in munin-2.0.17/master/lib/Munin/Master: Node.pm.orig
+diff -ur munin-2.0.17/master/lib/Munin/Master/Utils.pm munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.17/master/lib/Munin/Master/Utils.pm 2013-08-17 12:26:06.476625774 +0200
++++ munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm 2013-08-17 12:19:22.389482886 +0200
+@@ -115,7 +115,7 @@
+ },
+ };
-my $configfile="$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
+my $configfile="$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
# Fields to copy when "aliasing" a field
my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info");
-diff -ur munin-1.4.0/master/munin.conf.in munin-1.4.0.configs/master/munin.conf.in
---- munin-1.4.0/master/munin.conf.in 2009-11-30 17:45:38.246730214 +0100
-+++ munin-1.4.0.configs/master/munin.conf.in 2009-11-30 17:38:23.000000000 +0100
-@@ -15,7 +15,7 @@
+Only in munin-2.0.17/master/lib/Munin/Master: Utils.pm.orig
+diff -ur munin-2.0.17/master/munin.conf.in munin-2.0.17-sep/master/munin.conf.in
+--- munin-2.0.17/master/munin.conf.in 2013-08-17 12:26:06.476625774 +0200
++++ munin-2.0.17-sep/master/munin.conf.in 2013-08-17 12:19:22.389482886 +0200
+@@ -24,7 +24,7 @@
+ # cgitmpdir @@DBDIR@@/cgi-tmp
# (Exactly one) directory to include all files from.
- #
-includedir @@CONFDIR@@/munin-conf.d
+includedir @@MCONFDIR@@/munin-conf.d
- # Make graphs show values per minute instead of per second
- #graph_period minute
-diff -ur munin-1.4.0/master/www/munin-htaccess.in munin-1.4.0.configs/master/www/munin-htaccess.in
---- munin-1.4.0/master/www/munin-htaccess.in 2009-11-27 12:17:16.000000000 +0100
-+++ munin-1.4.0.configs/master/www/munin-htaccess.in 2009-11-30 17:37:25.000000000 +0100
+ # You can choose the time reference for "DERIVE" like graphs, and show
+ # "per minute", "per hour" values instead of the default "per second"
+Only in munin-2.0.17/master: munin.conf.in.orig
+diff -ur munin-2.0.17/master/t/munin_master_config.t munin-2.0.17-sep/master/t/munin_master_config.t
+--- munin-2.0.17/master/t/munin_master_config.t 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/t/munin_master_config.t 2013-08-17 12:23:31.933897977 +0200
+@@ -24,7 +24,7 @@
+ },
+
+ config => {
+- config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
++ config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
+ dbdir => '/opt/munin/sandbox/var/opt/munin',
+ debug => 0,
+ fork => 1,
+diff -ur munin-2.0.17/master/www/munin-htaccess.in munin-2.0.17-sep/master/www/munin-htaccess.in
+--- munin-2.0.17/master/www/munin-htaccess.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/master/www/munin-htaccess.in 2013-08-17 12:19:22.389482886 +0200
@@ -9,7 +9,7 @@
#
# <directory @@HTMLDIR@@>
@@ -533,9 +486,9 @@ diff -ur munin-1.4.0/master/www/munin-htaccess.in munin-1.4.0.configs/master/www
AuthName "Munin"
AuthType Basic
require valid-user
-diff -ur munin-1.4.0/node/bin/munindoc munin-1.4.0.configs/node/bin/munindoc
---- munin-1.4.0/node/bin/munindoc 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/bin/munindoc 2009-11-30 17:41:00.000000000 +0100
+diff -ur munin-2.0.17/node/bin/munindoc munin-2.0.17-sep/node/bin/munindoc
+--- munin-2.0.17/node/bin/munindoc 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/bin/munindoc 2013-08-17 12:19:22.389482886 +0200
@@ -48,7 +48,7 @@
# Dirs in which to look for $plugin.pod and $plugin files.
@@ -545,9 +498,36 @@ diff -ur munin-1.4.0/node/bin/munindoc munin-1.4.0.configs/node/bin/munindoc
"$Munin::Common::Defaults::MUNIN_PERLLIB");
File::Find::find({wanted => \&wanted_pod}, @DIRS);
-diff -ur munin-1.4.0/node/extras/munin-node-simple.in munin-1.4.0.configs/node/extras/munin-node-simple.in
---- munin-1.4.0/node/extras/munin-node-simple.in 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/extras/munin-node-simple.in 2009-11-30 17:41:11.000000000 +0100
+diff -ur munin-2.0.17/node/doc/munin-node.conf.pod munin-2.0.17-sep/node/doc/munin-node.conf.pod
+--- munin-2.0.17/node/doc/munin-node.conf.pod 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/doc/munin-node.conf.pod 2013-08-17 12:24:04.784478220 +0200
+@@ -91,20 +91,20 @@
+ =item B<tls_private_key> <value>
+
+ This directive sets the location of the private key to be used for
+-TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
++TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
+ certificate can be stored in the same file.
+
+ =item B<tls_certificate> <value>
+
+ This directive sets the location of the TLS certificate to be used for
+-TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
++TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
+ certificate can be stored in the same file.
+
+ =item B<tls_ca_certificate> <value>
+
+ This directive sets the CA certificate to be used to verify the node's
+ certificate, if tls_verify_certificate is set to C<yes>. Default is
+-@@CONFDIR@@/cacert.pem.
++@@NCONFDIR@@/cacert.pem.
+
+ =item B<tls_verify_depth> <value>
+
+diff -ur munin-2.0.17/node/extras/munin-node-simple.in munin-2.0.17-sep/node/extras/munin-node-simple.in
+--- munin-2.0.17/node/extras/munin-node-simple.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/extras/munin-node-simple.in 2013-08-17 12:19:22.389482886 +0200
@@ -28,8 +28,8 @@
$| = 1;
@@ -559,22 +539,22 @@ diff -ur munin-1.4.0/node/extras/munin-node-simple.in munin-1.4.0.configs/node/e
my $version = "@@VERSION@@";
# Empty environment
-diff -ur munin-1.4.0/node/lib/Munin/Node/Config.pm munin-1.4.0.configs/node/lib/Munin/Node/Config.pm
---- munin-1.4.0/node/lib/Munin/Node/Config.pm 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/lib/Munin/Node/Config.pm 2009-11-30 17:40:38.000000000 +0100
+diff -ur munin-2.0.17/node/lib/Munin/Node/Config.pm munin-2.0.17-sep/node/lib/Munin/Node/Config.pm
+--- munin-2.0.17/node/lib/Munin/Node/Config.pm 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/lib/Munin/Node/Config.pm 2013-08-17 12:19:22.389482886 +0200
@@ -25,7 +25,7 @@
my ($class) = @_;
-
+
$instance ||= bless {
- config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf",
+ config_file => "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf",
}, $class;
return $instance;
-diff -ur munin-1.4.0/node/lib/Munin/Node/Server.pm munin-1.4.0.configs/node/lib/Munin/Node/Server.pm
---- munin-1.4.0/node/lib/Munin/Node/Server.pm 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/lib/Munin/Node/Server.pm 2009-11-30 17:36:02.000000000 +0100
-@@ -227,11 +227,11 @@
+diff -ur munin-2.0.17/node/lib/Munin/Node/Server.pm munin-2.0.17-sep/node/lib/Munin/Node/Server.pm
+--- munin-2.0.17/node/lib/Munin/Node/Server.pm 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/lib/Munin/Node/Server.pm 2013-08-17 12:19:22.389482886 +0200
+@@ -263,11 +263,11 @@
my $mode = $session->{tls_mode};
my $key = $config->{tls_private_key}
@@ -587,34 +567,35 @@ diff -ur munin-1.4.0/node/lib/Munin/Node/Server.pm munin-1.4.0.configs/node/lib/
- || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem";
+ || "$Munin::Common::Defaults::MUNIN_NCONFDIR/cacert.pem";
my $tls_verify = $config->{tls_verify_certificate}
- || 'no';
-
-diff -ur munin-1.4.0/node/sbin/munin-node munin-1.4.0.configs/node/sbin/munin-node
---- munin-1.4.0/node/sbin/munin-node 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/sbin/munin-node 2009-11-30 17:39:16.000000000 +0100
-@@ -33,9 +33,9 @@
- use Munin::Node::OS;
+ || 0;
+ my $tls_match = $config->{tls_match};
+diff -ur munin-2.0.17/node/lib/Munin/Node/Service.pm munin-2.0.17-sep/node/lib/Munin/Node/Service.pm
+--- munin-2.0.17/node/lib/Munin/Node/Service.pm 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/lib/Munin/Node/Service.pm 2013-08-17 12:24:22.264786886 +0200
+@@ -22,7 +22,7 @@
+ my ($class, %args) = @_;
+
+ # Set defaults
+- $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
++ $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
+
+ $args{defuser} ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
+ $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
+diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
+--- munin-2.0.17/node/sbin/munin-node 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/sbin/munin-node 2013-08-17 12:19:22.389482886 +0200
+@@ -36,8 +36,8 @@
use Munin::Node::Server;
--my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
--my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
--my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
-+my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
-+my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
-+my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
- my $FQDN = "";
- my $DEBUG = 0;
- my $PIDEBUG = 0;
-@@ -143,7 +143,7 @@
- Options:
- --help View this message.
- --config <file> Use <file> as configuration file.
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf]
- --[no]paranoia Only run plugins owned by root. Check permissions.
- [--noparanoia]
- --debug View debug messages
-@@ -180,7 +180,7 @@
+ my $servicedir;
+-my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
+-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
++my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
++my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
+ my $DEBUG = 0;
+ my $PIDEBUG = 0;
+ my $paranoia = 0;
+@@ -164,7 +164,7 @@
=item B<< --config <configfile> >>
@@ -623,7 +604,7 @@ diff -ur munin-1.4.0/node/sbin/munin-node munin-1.4.0.configs/node/sbin/munin-no
=item B< --[no]paranoia >
-@@ -208,9 +208,9 @@
+@@ -187,9 +187,9 @@
=head1 FILES
@@ -636,10 +617,10 @@ diff -ur munin-1.4.0/node/sbin/munin-node munin-1.4.0.configs/node/sbin/munin-no
@@STATEDIR@@/munin-node.pid
@@LOGDIR@@/munin-node.log
-diff -ur munin-1.4.0/node/sbin/munin-node-configure munin-1.4.0.configs/node/sbin/munin-node-configure
---- munin-1.4.0/node/sbin/munin-node-configure 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/sbin/munin-node-configure 2009-11-30 17:34:09.000000000 +0100
-@@ -88,9 +88,9 @@
+diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/munin-node-configure
+--- munin-2.0.17/node/sbin/munin-node-configure 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/sbin/munin-node-configure 2013-08-17 12:19:22.489484658 +0200
+@@ -76,9 +76,9 @@
sub parse_args
{
@@ -651,23 +632,8 @@ diff -ur munin-1.4.0/node/sbin/munin-node-configure munin-1.4.0.configs/node/sbi
+ my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
- my $debug;
-@@ -180,11 +180,11 @@
- printed on STDERR.
-
- --config <file> Override configuration file
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf]
- --servicedir <dir> Override plugin directory
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/plugins/]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins/]
- --sconfdir <dir> Override plugin configuration directory
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d]
- --libdir <dir> Override plugin lib
- [$Munin::Common::Defaults::MUNIN_LIBDIR/plugins/]
-
-@@ -520,15 +520,15 @@
+ my $debug = 0;
+@@ -492,15 +492,15 @@
=item B<< --config <file> >>
@@ -676,8 +642,8 @@ diff -ur munin-1.4.0/node/sbin/munin-node-configure munin-1.4.0.configs/node/sbi
=item B<< --servicedir <dir> >>
--Override plugin dir [@@CONFDIR@@/plugins/]
-+Override plugin dir [@@NCONFDIR@@/plugins/]
+-Override plugin directory [@@CONFDIR@@/plugins/]
++Override plugin directory [@@NCONFDIR@@/plugins/]
=item B<< --sconfdir <dir> >>
@@ -686,7 +652,7 @@ diff -ur munin-1.4.0/node/sbin/munin-node-configure munin-1.4.0.configs/node/sbi
=item B<< --libdir <dir> >>
-@@ -588,9 +588,9 @@
+@@ -648,9 +648,9 @@
=head1 FILES
@@ -699,38 +665,28 @@ diff -ur munin-1.4.0/node/sbin/munin-node-configure munin-1.4.0.configs/node/sbi
@@LIBDIR@@/plugins/plugins.history
@@LIBDIR@@/plugins/*
-diff -ur munin-1.4.0/node/sbin/munin-run munin-1.4.0.configs/node/sbin/munin-run
---- munin-1.4.0/node/sbin/munin-run 2009-11-27 12:17:13.000000000 +0100
-+++ munin-1.4.0.configs/node/sbin/munin-run 2009-11-30 17:40:19.000000000 +0100
-@@ -102,9 +102,9 @@
+diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
+--- munin-2.0.17/node/sbin/munin-run 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/sbin/munin-run 2013-08-17 12:19:22.489484658 +0200
+@@ -35,7 +35,7 @@
+
+ my $services;
+ my $servicedir;
+-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
++my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
+ my $DEBUG = 0;
+ my $PIDEBUG = 0;
+ my $paranoia = 0;
+@@ -98,7 +98,7 @@
sub parse_args
{
# Default configuration values
-- my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
- my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
-- my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
-+ my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
+ my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
-+ my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
my $sconffile;
- my ($DEBUG, $PIDEBUG) = (0, 0);
-@@ -186,11 +186,11 @@
- Options:
- --help View this message.
- --config <file> Use <file> as configuration file.
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf]
- --servicedir <dir> Dir where plugins are found.
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/plugins]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins]
- --sconfdir <dir> Dir where plugin configurations are found.
-- [$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d]
-+ [$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d]
- --sconffile <file> Use <file> as plugin configuration. Overrides sconfdir.
- [undefined]
- --[no]paranoia Only run plugins owned by root. Check permissions.
-@@ -226,15 +226,15 @@
+ my ($plugin, $arg);
+@@ -189,15 +189,15 @@
=item B<< --config <configfile> >>
@@ -749,7 +705,7 @@ diff -ur munin-1.4.0/node/sbin/munin-run munin-1.4.0.configs/node/sbin/munin-run
=item B<< --sconffile <file> >>
-@@ -273,9 +273,9 @@
+@@ -230,9 +230,9 @@
=head1 FILES
@@ -762,9 +718,45 @@ diff -ur munin-1.4.0/node/sbin/munin-run munin-1.4.0.configs/node/sbin/munin-run
@@STATEDIR@@/munin-node.pid
@@LOGDIR@@/munin-node.log
-diff -ur munin-1.4.0/plugins/node.d/exim_mailqueue.in munin-1.4.0.configs/plugins/node.d/exim_mailqueue.in
---- munin-1.4.0/plugins/node.d/exim_mailqueue.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/exim_mailqueue.in 2009-11-30 17:42:09.000000000 +0100
+diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sched
+--- munin-2.0.17/node/sbin/munin-sched 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/node/sbin/munin-sched 2013-08-17 12:24:54.562023692 +0200
+@@ -34,8 +34,8 @@
+ use Munin::Node::ProxySpooler;
+
+ my $servicedir;
+-my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
+-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
++my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
++my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
+ my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
+
+ my ($host, $port);
+@@ -164,7 +164,7 @@
+
+ =item B<< --config <configfile> >>
+
+-Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
++Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
+
+ =item B< --[no]paranoia >
+
+@@ -182,9 +182,9 @@
+
+ =head1 FILES
+
+- @@CONFDIR@@/munin-node.conf
+- @@CONFDIR@@/plugins/*
+- @@CONFDIR@@/plugin-conf.d/*
++ @@NCONFDIR@@/munin-node.conf
++ @@NCONFDIR@@/plugins/*
++ @@NCONFDIR@@/plugin-conf.d/*
+ @@STATEDIR@@/munin-sched.pid
+ @@LOGDIR@@/munin-sched.log
+
+diff -ur munin-2.0.17/plugins/node.d/exim_mailqueue.in munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in
+--- munin-2.0.17/plugins/node.d/exim_mailqueue.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in 2013-08-17 12:19:22.489484658 +0200
@@ -15,7 +15,7 @@
[exim_*]
user exim
@@ -774,9 +766,9 @@ diff -ur munin-1.4.0/plugins/node.d/exim_mailqueue.in munin-1.4.0.configs/plugin
if you need to override the defaults below:
[exim_mailqueue]
-diff -ur munin-1.4.0/plugins/node.d/ipmi_sensor_.in munin-1.4.0.configs/plugins/node.d/ipmi_sensor_.in
---- munin-1.4.0/plugins/node.d/ipmi_sensor_.in 2009-11-27 12:17:11.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/ipmi_sensor_.in 2009-11-30 17:42:27.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in
+--- munin-2.0.17/plugins/node.d/ipmi_sensor_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in 2013-08-17 12:19:22.489484658 +0200
@@ -17,7 +17,7 @@
ipmitool probably needs to be run as root, and it may take more than
10 seconds on some hosts.
@@ -786,7 +778,7 @@ diff -ur munin-1.4.0/plugins/node.d/ipmi_sensor_.in munin-1.4.0.configs/plugins/
[ipmi_sensor_*]
user root
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
=head1 BUGS
@@ -795,8 +787,8 @@ diff -ur munin-1.4.0/plugins/node.d/ipmi_sensor_.in munin-1.4.0.configs/plugins/
variables.
=head1 MAGIC MARKERS
-@@ -73,7 +73,7 @@
- CACHEDIR = "@@PLUGSTATE@@"
+@@ -72,7 +72,7 @@
+ CACHEDIR = os.environ['MUNIN_PLUGSTATE']
CACHEFILE = "plugin-ipmi_sensor.cache"
CACHEAGE = 120
-CONFIG = '@@CONFDIR@@/ipmi'
@@ -804,9 +796,9 @@ diff -ur munin-1.4.0/plugins/node.d/ipmi_sensor_.in munin-1.4.0.configs/plugins/
-diff -ur munin-1.4.0/plugins/node.d/mysql_innodb.in munin-1.4.0.configs/plugins/node.d/mysql_innodb.in
---- munin-1.4.0/plugins/node.d/mysql_innodb.in 2009-11-27 12:17:11.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/mysql_innodb.in 2009-11-30 17:42:53.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-sep/plugins/node.d/mysql_innodb.in
+--- munin-2.0.17/plugins/node.d/mysql_innodb.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/mysql_innodb.in 2013-08-17 12:19:22.489484658 +0200
@@ -34,7 +34,7 @@
=head1 CONFIGURATION
@@ -816,10 +808,10 @@ diff -ur munin-1.4.0/plugins/node.d/mysql_innodb.in munin-1.4.0.configs/plugins/
if you need to override the defaults below:
[mysql_innodb]
-diff -ur munin-1.4.0/plugins/node.d/mysql_isam_space_.in munin-1.4.0.configs/plugins/node.d/mysql_isam_space_.in
---- munin-1.4.0/plugins/node.d/mysql_isam_space_.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/mysql_isam_space_.in 2009-11-30 17:41:30.000000000 +0100
-@@ -11,7 +11,7 @@
+diff -ur munin-2.0.17/plugins/node.d/mysql_isam_space_.in munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in
+--- munin-2.0.17/plugins/node.d/mysql_isam_space_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in 2013-08-17 12:19:22.489484658 +0200
+@@ -8,7 +8,7 @@
=head1 CONFIGURATION
@@ -828,9 +820,9 @@ diff -ur munin-1.4.0/plugins/node.d/mysql_isam_space_.in munin-1.4.0.configs/plu
if you need to override the defaults below:
[mysql_isam_space_*]
-diff -ur munin-1.4.0/plugins/node.d/mysql_threads.in munin-1.4.0.configs/plugins/node.d/mysql_threads.in
---- munin-1.4.0/plugins/node.d/mysql_threads.in 2009-11-30 17:45:38.180724509 +0100
-+++ munin-1.4.0.configs/plugins/node.d/mysql_threads.in 2009-11-30 17:43:19.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-sep/plugins/node.d/mysql_threads.in
+--- munin-2.0.17/plugins/node.d/mysql_threads.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/mysql_threads.in 2013-08-17 12:19:22.489484658 +0200
@@ -9,7 +9,7 @@
=head1 CONFIGURATION
@@ -840,9 +832,9 @@ diff -ur munin-1.4.0/plugins/node.d/mysql_threads.in munin-1.4.0.configs/plugins
need to override the defaults below:
[mysql_threads]
-diff -ur munin-1.4.0/plugins/node.d/named.in munin-1.4.0.configs/plugins/node.d/named.in
---- munin-1.4.0/plugins/node.d/named.in 2009-11-27 12:17:11.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/named.in 2009-11-30 17:43:03.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/named.in munin-2.0.17-sep/plugins/node.d/named.in
+--- munin-2.0.17/plugins/node.d/named.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/named.in 2013-08-17 12:19:22.489484658 +0200
@@ -34,7 +34,7 @@
=head1 CONFIGURATION
@@ -852,9 +844,9 @@ diff -ur munin-1.4.0/plugins/node.d/named.in munin-1.4.0.configs/plugins/node.d/
if you need to override the defaults below:
[named]
-diff -ur munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in munin-1.4.0.configs/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/ntp_kernel_pll_freq.in 2009-11-30 17:41:46.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 12:19:22.489484658 +0200
@@ -12,7 +12,7 @@
No configuration
@@ -875,9 +867,9 @@ diff -ur munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in munin-1.4.0.configs/p
else
fcomp=0
fi
-diff -ur munin-1.4.0/plugins/node.d/postfix_mailstats.in munin-1.4.0.configs/plugins/node.d/postfix_mailstats.in
---- munin-1.4.0/plugins/node.d/postfix_mailstats.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/postfix_mailstats.in 2009-11-30 17:42:45.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/postfix_mailstats.in munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in
+--- munin-2.0.17/plugins/node.d/postfix_mailstats.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in 2013-08-17 12:19:22.489484658 +0200
@@ -8,7 +8,7 @@
=head1 CONFIGURATION
@@ -887,9 +879,9 @@ diff -ur munin-1.4.0/plugins/node.d/postfix_mailstats.in munin-1.4.0.configs/plu
if you need to override the defaults below:
[postfix_mailstats]
-diff -ur munin-1.4.0/plugins/node.d/psu_.in munin-1.4.0.configs/plugins/node.d/psu_.in
---- munin-1.4.0/plugins/node.d/psu_.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/psu_.in 2009-11-30 17:42:37.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d/psu_.in munin-2.0.17-sep/plugins/node.d/psu_.in
+--- munin-2.0.17/plugins/node.d/psu_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/psu_.in 2013-08-17 12:19:22.489484658 +0200
@@ -15,7 +15,7 @@
Example:
@@ -899,21 +891,21 @@ diff -ur munin-1.4.0/plugins/node.d/psu_.in munin-1.4.0.configs/plugins/node.d/p
...will monitor the user "foo"
-diff -ur munin-1.4.0/plugins/node.d/squeezebox_.in munin-1.4.0.configs/plugins/node.d/squeezebox_.in
---- munin-1.4.0/plugins/node.d/squeezebox_.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/squeezebox_.in 2009-11-30 17:43:10.000000000 +0100
-@@ -19,7 +19,7 @@
+diff -ur munin-2.0.17/plugins/node.d/squeezebox_.in munin-2.0.17-sep/plugins/node.d/squeezebox_.in
+--- munin-2.0.17/plugins/node.d/squeezebox_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/squeezebox_.in 2013-08-17 12:19:22.489484658 +0200
+@@ -20,7 +20,7 @@
non-default configuration, please use the environment variables
'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
- netcat(1) binary is anywhere else than /bin/nc please define it in the
--plugin's environment file (@@CONFDIR@@/squeezebox or
-+plugin's environment file (@@NCONFDIR@@/squeezebox or
- similar). Sample follows:
-
- [squeezebox_*]
-diff -ur munin-1.4.0/plugins/node.d/varnish_.in munin-1.4.0.configs/plugins/node.d/varnish_.in
---- munin-1.4.0/plugins/node.d/varnish_.in 2009-11-27 12:17:10.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d/varnish_.in 2009-11-30 17:41:59.000000000 +0100
+ nc(1) binary is not called "nc", or not the one in $PATH, please define it
+-in the plugin's environment file (@@CONFDIR@@/squeezebox or similar).
++in the plugin's environment file (@@NCONFDIR@@/squeezebox or similar).
+
+ Sample follows:
+
+diff -ur munin-2.0.17/plugins/node.d/varnish_.in munin-2.0.17-sep/plugins/node.d/varnish_.in
+--- munin-2.0.17/plugins/node.d/varnish_.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d/varnish_.in 2013-08-17 12:19:22.492818051 +0200
@@ -54,7 +54,7 @@
You can link them yourself with something like this:
@@ -921,11 +913,47 @@ diff -ur munin-1.4.0/plugins/node.d/varnish_.in munin-1.4.0.configs/plugins/node
- @@CONFDIR@@/plugins/varnish_data_structures
+ @@NCONFDIR@@/plugins/varnish_data_structures
- =head1 INTERPERTATION
+ =head1 INTERPRETATION
+
+diff -ur munin-2.0.17/plugins/node.d.cygwin/df.in munin-2.0.17-sep/plugins/node.d.cygwin/df.in
+--- munin-2.0.17/plugins/node.d.cygwin/df.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.cygwin/df.in 2013-08-17 12:25:08.005594281 +0200
+@@ -13,7 +13,7 @@
+
+ =head1 USAGE
+
+-Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
++Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
+
+ The plugin excludes per default the following special, read-only or
+ dynamically allocating file systems from graphing:
+diff -ur munin-2.0.17/plugins/node.d.debug/if.in munin-2.0.17-sep/plugins/node.d.debug/if.in
+--- munin-2.0.17/plugins/node.d.debug/if.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.debug/if.in 2013-08-17 12:25:17.379093018 +0200
+@@ -21,7 +21,7 @@
-diff -ur munin-1.4.0/plugins/node.d.linux/acpi.in munin-1.4.0.configs/plugins/node.d.linux/acpi.in
---- munin-1.4.0/plugins/node.d.linux/acpi.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/acpi.in 2009-11-30 17:43:46.000000000 +0100
+ =head1 USAGE
+
+-Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
++Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
+
+ =head1 MAGIC MARKERS
+
+diff -ur munin-2.0.17/plugins/node.d.debug/tc.in munin-2.0.17-sep/plugins/node.d.debug/tc.in
+--- munin-2.0.17/plugins/node.d.debug/tc.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.debug/tc.in 2013-08-17 12:25:26.375918427 +0200
+@@ -21,7 +21,7 @@
+
+ =head1 USAGE
+
+-Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
++Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
+
+ =head1 MAGIC MARKERS
+
+diff -ur munin-2.0.17/plugins/node.d.linux/acpi.in munin-2.0.17-sep/plugins/node.d.linux/acpi.in
+--- munin-2.0.17/plugins/node.d.linux/acpi.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/acpi.in 2013-08-17 12:19:22.492818051 +0200
@@ -17,7 +17,7 @@
=head1 USAGE
@@ -935,9 +963,9 @@ diff -ur munin-1.4.0/plugins/node.d.linux/acpi.in munin-1.4.0.configs/plugins/no
=head1 INTERPRETATION
-diff -ur munin-1.4.0/plugins/node.d.linux/apt.in munin-1.4.0.configs/plugins/node.d.linux/apt.in
---- munin-1.4.0/plugins/node.d.linux/apt.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/apt.in 2009-11-30 17:44:34.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d.linux/apt.in munin-2.0.17-sep/plugins/node.d.linux/apt.in
+--- munin-2.0.17/plugins/node.d.linux/apt.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/apt.in 2013-08-17 12:19:22.492818051 +0200
@@ -38,7 +38,7 @@
=head1 USAGE
@@ -945,12 +973,33 @@ diff -ur munin-1.4.0/plugins/node.d.linux/apt.in munin-1.4.0.configs/plugins/nod
-Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node.
+Link this plugin in @@NCONFDIR@@/plugins/ and restart the munin-node.
+ =head1 NOTES
+
+diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d.linux/df.in
+--- munin-2.0.17/plugins/node.d.linux/df.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/df.in 2013-08-17 12:19:22.492818051 +0200
+@@ -28,7 +28,7 @@
+ env.warning 92
+ env.critical 98
+
+-Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
++Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
+
+ You may specify filesystem specific warning and critical levels:
+
+@@ -55,7 +55,7 @@
+
+ =head1 USAGE
+
+-Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
++Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
+
=head1 MAGIC MARKERS
-diff -ur munin-1.4.0/plugins/node.d.linux/df.in munin-1.4.0.configs/plugins/node.d.linux/df.in
---- munin-1.4.0/plugins/node.d.linux/df.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/df.in 2009-11-30 17:44:11.000000000 +0100
-@@ -28,16 +28,16 @@
+diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/node.d.linux/df_inode.in
+--- munin-2.0.17/plugins/node.d.linux/df_inode.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/df_inode.in 2013-08-17 12:25:37.609449943 +0200
+@@ -28,7 +28,7 @@
env.warning 92
env.critical 98
@@ -959,43 +1008,42 @@ diff -ur munin-1.4.0/plugins/node.d.linux/df.in munin-1.4.0.configs/plugins/node
You may specify filesystem specific warning and critical levels:
- env._dev_sda2_warning 98
- env._dev_sda2_critical 99
+@@ -55,7 +55,7 @@
- =head1 USAGE
+ =head1 USAGE
-Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
+Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
=head1 MAGIC MARKERS
-diff -ur munin-1.4.0/plugins/node.d.linux/fw_conntrack.in munin-1.4.0.configs/plugins/node.d.linux/fw_conntrack.in
---- munin-1.4.0/plugins/node.d.linux/fw_conntrack.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/fw_conntrack.in 2009-11-30 17:44:18.000000000 +0100
-@@ -14,7 +14,7 @@
+diff -ur munin-2.0.17/plugins/node.d.linux/fw_conntrack.in munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in
+--- munin-2.0.17/plugins/node.d.linux/fw_conntrack.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in 2013-08-17 12:19:22.492818051 +0200
+@@ -11,7 +11,7 @@
=head2 CONFIGURATION EXAMPLE
-@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
+@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
- [fw*]
+ [fw_*]
user root
-diff -ur munin-1.4.0/plugins/node.d.linux/fw_forwarded_local.in munin-1.4.0.configs/plugins/node.d.linux/fw_forwarded_local.in
---- munin-1.4.0/plugins/node.d.linux/fw_forwarded_local.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/fw_forwarded_local.in 2009-11-30 17:43:36.000000000 +0100
-@@ -13,7 +13,7 @@
+diff -ur munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in
+--- munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in 2013-08-17 12:19:22.492818051 +0200
+@@ -10,7 +10,7 @@
- =head1 CONFIGURATION EXAMPLE
+ =head2 CONFIGURATION EXAMPLE
-@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
+@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
- [fw*]
+ [fw_*]
user root
-diff -ur munin-1.4.0/plugins/node.d.linux/fw_packets.in munin-1.4.0.configs/plugins/node.d.linux/fw_packets.in
---- munin-1.4.0/plugins/node.d.linux/fw_packets.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/fw_packets.in 2009-11-30 17:43:55.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d.linux/fw_packets.in munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in
+--- munin-2.0.17/plugins/node.d.linux/fw_packets.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in 2013-08-17 12:19:22.492818051 +0200
@@ -11,7 +11,7 @@
=head1 CONFIGURATION EXAMPLE
@@ -1005,9 +1053,9 @@ diff -ur munin-1.4.0/plugins/node.d.linux/fw_packets.in munin-1.4.0.configs/plug
[fw*]
user root
-diff -ur munin-1.4.0/plugins/node.d.linux/iostat.in munin-1.4.0.configs/plugins/node.d.linux/iostat.in
---- munin-1.4.0/plugins/node.d.linux/iostat.in 2009-11-30 17:45:38.201723751 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/iostat.in 2009-11-30 17:44:41.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-sep/plugins/node.d.linux/iostat.in
+--- munin-2.0.17/plugins/node.d.linux/iostat.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/iostat.in 2013-08-17 12:19:22.492818051 +0200
@@ -24,7 +24,7 @@
=head1 USAGE
@@ -1017,9 +1065,9 @@ diff -ur munin-1.4.0/plugins/node.d.linux/iostat.in munin-1.4.0.configs/plugins/
=head1 INTERPRETATION
-diff -ur munin-1.4.0/plugins/node.d.linux/iostat_ios.in munin-1.4.0.configs/plugins/node.d.linux/iostat_ios.in
---- munin-1.4.0/plugins/node.d.linux/iostat_ios.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/iostat_ios.in 2009-11-30 17:44:26.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d.linux/iostat_ios.in munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in
+--- munin-2.0.17/plugins/node.d.linux/iostat_ios.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in 2013-08-17 12:19:22.492818051 +0200
@@ -15,7 +15,7 @@
=head1 USAGE
@@ -1029,9 +1077,9 @@ diff -ur munin-1.4.0/plugins/node.d.linux/iostat_ios.in munin-1.4.0.configs/plug
=head1 INTERPRETATION
-diff -ur munin-1.4.0/plugins/node.d.linux/irqstats.in munin-1.4.0.configs/plugins/node.d.linux/irqstats.in
---- munin-1.4.0/plugins/node.d.linux/irqstats.in 2009-11-27 12:17:05.000000000 +0100
-+++ munin-1.4.0.configs/plugins/node.d.linux/irqstats.in 2009-11-30 17:44:02.000000000 +0100
+diff -ur munin-2.0.17/plugins/node.d.linux/irqstats.in munin-2.0.17-sep/plugins/node.d.linux/irqstats.in
+--- munin-2.0.17/plugins/node.d.linux/irqstats.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/plugins/node.d.linux/irqstats.in 2013-08-17 12:19:22.492818051 +0200
@@ -15,7 +15,7 @@
=head1 USAGE
@@ -1041,9 +1089,9 @@ diff -ur munin-1.4.0/plugins/node.d.linux/irqstats.in munin-1.4.0.configs/plugin
=head1 INTERPRETATION
-diff -ur munin-1.4.0/resources/hpux-init.d_munin-node.in munin-1.4.0.configs/resources/hpux-init.d_munin-node.in
---- munin-1.4.0/resources/hpux-init.d_munin-node.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/resources/hpux-init.d_munin-node.in 2009-11-30 17:45:11.000000000 +0100
+diff -ur munin-2.0.17/resources/hpux-init.d_munin-node.in munin-2.0.17-sep/resources/hpux-init.d_munin-node.in
+--- munin-2.0.17/resources/hpux-init.d_munin-node.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/resources/hpux-init.d_munin-node.in 2013-08-17 12:19:22.492818051 +0200
@@ -6,7 +6,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
NAME=munin-node
@@ -1053,9 +1101,9 @@ diff -ur munin-1.4.0/resources/hpux-init.d_munin-node.in munin-1.4.0.configs/res
RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
MYCONF=/etc/rc.config.d/muninconf
-diff -ur munin-1.4.0/resources/linux-cron.d_munin-node.in munin-1.4.0.configs/resources/linux-cron.d_munin-node.in
---- munin-1.4.0/resources/linux-cron.d_munin-node.in 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/resources/linux-cron.d_munin-node.in 2009-11-30 17:45:01.000000000 +0100
+diff -ur munin-2.0.17/resources/linux-cron.d_munin-node.in munin-2.0.17-sep/resources/linux-cron.d_munin-node.in
+--- munin-2.0.17/resources/linux-cron.d_munin-node.in 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/resources/linux-cron.d_munin-node.in 2013-08-17 12:19:22.492818051 +0200
@@ -8,5 +8,5 @@
# an hour (12 invokations an hour, 1 in 12 chance that the update will
# happen), but ensure that there will never be more than two hour (7200
@@ -1063,9 +1111,9 @@ diff -ur munin-1.4.0/resources/linux-cron.d_munin-node.in munin-1.4.0.configs/re
-*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
+*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
-diff -ur munin-1.4.0/t/Makefile.config munin-1.4.0.configs/t/Makefile.config
---- munin-1.4.0/t/Makefile.config 2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.configs/t/Makefile.config 2009-11-30 17:45:21.000000000 +0100
+diff -ur munin-2.0.17/t/Makefile.config munin-2.0.17-sep/t/Makefile.config
+--- munin-2.0.17/t/Makefile.config 2013-07-19 18:30:03.000000000 +0200
++++ munin-2.0.17-sep/t/Makefile.config 2013-08-17 12:19:22.492818051 +0200
@@ -9,7 +9,8 @@
PREFIX = $(PWD)/t/install
diff --git a/munin-templatedir.patch b/munin-templatedir.patch
index cee667a..eb94020 100644
--- a/munin-templatedir.patch
+++ b/munin-templatedir.patch
@@ -24,50 +24,53 @@ diff -ur munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in munin-
diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
--- munin-1.4.0/Makefile 2009-11-30 15:56:58.665729798 +0100
+++ munin-1.4.0.template/Makefile 2009-11-30 15:43:56.093673451 +0100
-@@ -72,8 +72,8 @@
+@@ -72,9 +72,9 @@
$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
install-master-prime: $(INFILES_MASTER) install-pre install-master
- mkdir -p $(CONFDIR)/templates
+- mkdir -p $(CONFDIR)/static
- mkdir -p $(CONFDIR)/templates/partial
+ mkdir -p $(TEMPLATEDIR)
++ mkdir -p $(TEMPLATEDIR)/static
+ mkdir -p $(TEMPLATEDIR)/partial
mkdir -p $(CONFDIR)/munin-conf.d
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
-@@ -87,14 +87,14 @@
+@@ -87,15 +87,15 @@
$(CHMOD) 0755 $(DBDIR)
- for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \
+ for p in master/www/*.tmpl ; do \
- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+ $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/ ; \
done
+ for p in master/static/* ; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
++ $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/static/ ; \
+ done
+
for p in master/www/partial/*.tmpl; do \
- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
+ $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/partial/ ; \
done
-- $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
-+ $(INSTALL) -m 0644 master/www/definitions.html $(TEMPLATEDIR)/
$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
-
@@ -217,6 +217,7 @@
+ -e 's|@@GOODSH@@|$(GOODSH)|g' \
-e 's|@@BASH@@|$(BASH)|g' \
-e 's|@@HASSETR@@|$(HASSETR)|g' \
- -e 's|@@SSPOOLDIR@@|$(SSPOOLDIR)|g' \
+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
$< > $@;
-@@ -255,6 +256,7 @@
+@@ -255,7 +256,8 @@
+ s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \
s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \
- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
-- s{(SSPOOLDIR \s+=\s).*}{\1q{$(SSPOOLDIR)};}x;' \
-+ s{(SSPOOLDIR \s+=\s).*}{\1q{$(SSPOOLDIR)};}x; \
-+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;' \
+- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \
++ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
++ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\
$< > $@
build-doc: build-doc-stamp Makefile Makefile.config
@@ -97,36 +100,45 @@ diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/do
diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.template/master/lib/Munin/Master/Config.pm
--- munin-1.4.0/master/lib/Munin/Master/Config.pm 2009-11-27 12:17:17.000000000 +0100
+++ munin-1.4.0.template/master/lib/Munin/Master/Config.pm 2009-11-30 15:50:50.533791958 +0100
-@@ -156,7 +156,7 @@
+@@ -156,8 +156,8 @@
tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
tls_verify_certificate => 0,
tls_verify_depth => 5,
- tmpldir => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates",
-+ tmpldir => $Munin::Common::Defaults::MUNIN_TEMPLATEDIR,
+- staticdir => "$Munin::Common::Defaults::MUNIN_CONFDIR/static",
++ tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
++ staticdir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static",
+ cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
}, $class ),
- oldconfig => bless ( {
diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.template/master/lib/Munin/Master/Utils.pm
--- munin-1.4.0/master/lib/Munin/Master/Utils.pm 2009-11-27 12:17:18.000000000 +0100
+++ munin-1.4.0.template/master/lib/Munin/Master/Utils.pm 2009-11-30 15:49:47.135724128 +0100
-@@ -273,7 +273,7 @@
+@@ -273,8 +273,8 @@
$config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
$config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR;
$config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
- $config->{'tmpldir'} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/";
-+ $config->{'tmpldir'} ||= $Munin::Common::Defaults::MUNIN_TEMPLATEDIR;
+- $config->{'staticdir'} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/static/";
++ $config->{'tmpldir'} ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR";
++ $config->{'staticdir'} ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static/";
$config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
$config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SSPOOLDIR;
$config->{'#%#parent'} = undef;
diff -ur munin-1.4.0/master/munin.conf.in munin-1.4.0.template/master/munin.conf.in
--- munin-1.4.0/master/munin.conf.in 2009-11-27 12:17:18.000000000 +0100
+++ munin-1.4.0.template/master/munin.conf.in 2009-11-30 15:47:40.690849769 +0100
-@@ -11,7 +11,7 @@
- # rundir @@STATEDIR@@
- #
+@@ -11,11 +11,11 @@
+
# Where to look for the HTML templates
--# tmpldir @@CONFDIR@@/templates
-+# tmpldir @@TEMPLATEDIR@@
+ #
+-#tmpldir @@CONFDIR@@/templates
++#tmpldir @@TEMPLATEDIR@@
- # (Exactly one) directory to include all files from.
+ # Where to look for the static www files
#
+-#staticdir @@CONFDIR@@/static
++#staticdir @@TEMPLATEDIR@@/static
+
+ # temporary cgi files are here. note that it has to be writable by
+ # the cgi user (usually nobody or httpd).
diff --git a/munin-timeout.patch b/munin-timeout.patch
index 985ad10..992190e 100644
--- a/munin-timeout.patch
+++ b/munin-timeout.patch
@@ -1,9 +1,9 @@
--- munin-1.4.0/master/lib/Munin/Master/Node.pm~ 2009-11-27 12:17:17.000000000 +0100
+++ munin-1.4.0/master/lib/Munin/Master/Node.pm 2009-12-01 17:33:33.041187499 +0100
@@ -27,7 +27,7 @@
- tls => undef,
- socket => undef,
- master_capabilities => qw(multigraph),
+ pid => undef,
+ writer => undef,
+ master_capabilities => "multigraph dirtyconfig",
- io_timeout => 120,
+ io_timeout => $config->{timeout},
configref => $configref,
diff --git a/munin.logrotate b/munin.logrotate
index 5ad1fad..18d55e6 100644
--- a/munin.logrotate
+++ b/munin.logrotate
@@ -1,3 +1,5 @@
+/var/log/munin/munin-cgi-graph.log
+/var/log/munin/munin-cgi-html.log
/var/log/munin/munin-graph.log
/var/log/munin/munin-html.log
/var/log/munin/munin-limits.log
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/munin.git/commitdiff/86c1c31498d3d98928a406260dbf4a47ccb87681
More information about the pld-cvs-commit
mailing list