Date: Tuesday, August 21, 2012 @ 10:05:23 Author: dan Revision: 165501
archrelease: copy trunk to extra-any Added: munin/repos/extra-any/08-munin-font-dir.conf (from rev 165500, munin/trunk/08-munin-font-dir.conf) munin/repos/extra-any/Makefile.config (from rev 165500, munin/trunk/Makefile.config) munin/repos/extra-any/PKGBUILD (from rev 165500, munin/trunk/PKGBUILD) munin/repos/extra-any/logrotate.munin (from rev 165500, munin/trunk/logrotate.munin) munin/repos/extra-any/logrotate.munin-node (from rev 165500, munin/trunk/logrotate.munin-node) munin/repos/extra-any/munin-cron-entry (from rev 165500, munin/trunk/munin-cron-entry) munin/repos/extra-any/munin-node.init (from rev 165500, munin/trunk/munin-node.init) munin/repos/extra-any/munin-node.install (from rev 165500, munin/trunk/munin-node.install) munin/repos/extra-any/munin.install (from rev 165500, munin/trunk/munin.install) munin/repos/extra-any/munin.tmpfiles.conf (from rev 165500, munin/trunk/munin.tmpfiles.conf) Deleted: munin/repos/extra-any/08-munin-font-dir.conf munin/repos/extra-any/Makefile.config munin/repos/extra-any/PKGBUILD munin/repos/extra-any/keep-defaults.patch munin/repos/extra-any/logrotate.munin munin/repos/extra-any/logrotate.munin-node munin/repos/extra-any/munin-cron-entry munin/repos/extra-any/munin-df-linux-excludes.patch munin/repos/extra-any/munin-lock-location.patch munin/repos/extra-any/munin-node.init munin/repos/extra-any/munin-node.install munin/repos/extra-any/munin.install -------------------------------+ 08-munin-font-dir.conf | 14 - Makefile.config | 281 +++++++++++++++++++--------------------- PKGBUILD | 152 ++++++++++----------- keep-defaults.patch | 23 --- logrotate.munin | 8 - logrotate.munin-node | 8 - munin-cron-entry | 12 - munin-df-linux-excludes.patch | 62 -------- munin-lock-location.patch | 85 ------------ munin-node.init | 84 +++++------ munin-node.install | 34 ++-- munin.install | 44 +++--- munin.tmpfiles.conf | 1 13 files changed, 317 insertions(+), 491 deletions(-) Deleted: 08-munin-font-dir.conf =================================================================== --- 08-munin-font-dir.conf 2012-08-21 14:04:52 UTC (rev 165500) +++ 08-munin-font-dir.conf 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <!-- Add the munin directory to available fonts in case - no other TTF packages have been installed --> - <dir>/usr/lib/munin</dir> -</fontconfig> Copied: munin/repos/extra-any/08-munin-font-dir.conf (from rev 165500, munin/trunk/08-munin-font-dir.conf) =================================================================== --- 08-munin-font-dir.conf (rev 0) +++ 08-munin-font-dir.conf 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <!-- Add the munin directory to available fonts in case + no other TTF packages have been installed --> + <dir>/usr/lib/munin</dir> +</fontconfig> Deleted: Makefile.config =================================================================== --- Makefile.config 2012-08-21 14:04:52 UTC (rev 165500) +++ Makefile.config 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,143 +0,0 @@ -# This file specifies where Munin will look for things after you've -# run 'make' in the source directory. Modify it to suit your needs. - -# DESTDIR is meant only for use when making Munin packages. Unless -# you're doing packaging do NOT set it. -# DESTDIR is empty during building, and optionally set to point to -# a shadow tree during make install. - -# Note: There is a need for a VARDIR, with DBDIR, PLUGSTATE, HTMLDIR -# and LOGDIR as subdirectories. Today, DBDIR contains configured -# domains, as well as PLUGSTATE, and we risk collisions. - -# -# the base of the Munin installation. -# -PREFIX = $(DESTDIR) - -# Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/munin - -# Server only - where to put munin-cron -BINDIR = $(PREFIX)/usr/bin - -# Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/usr/sbin - -# Where to put text and html documentation -DOCDIR = $(PREFIX)/usr/share/doc/munin - -# Where to put man pages -MANDIR = $(PREFIX)/usr/share/man - -# Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/usr/lib/munin - -# Server only - Output directory -HTMLDIR = $(PREFIX)/usr/share/munin/www -CGIDIR = $(PREFIX)/usr/share/munin/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 - -# Suggested directory name for a pulic ramdisk based tmp directory. -# SSPOOLDIR := /tmp/muninspool - -# Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/lib/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 - -# Where Munin should place its logs. -LOGDIR = $(DESTDIR)/var/log/munin - -# Location of PID files and other statefiles. -STATEDIR = $(DESTDIR)/var/run/munin - -# Location of server lock files. On the server, must be writable by the user -# "munin". -LOCKDIR = $(DESTDIR)/var/lock - -# The perl interpreter to use -PERL = /usr/bin/perl - -# The python interpreter to use (used by some plugins) -PYTHON = /usr/bin/env python2 - -# The ruby interpreter to use (used by some plugins) -RUBY := /usr/bin/env ruby - -# The java runtime to use (used by some plugins) -JAVARUN := /usr/bin/java - -# The java library dir to use (used by some plugins) -# this is needed in order to be able to install -# java libraries in a custom location. Many distrubutions -# enforce a spesific location for java libraries. -JAVALIBDIR:= $(LIBDIR) - - -# A modern (posix) shell. We're not looking for arrays, but $() and -# other modern stuff is expected. On a posix-system the expression -# below will find the right shell. Most Unixes released the last 10 -# years are POSIX compliant enough for this to work (he said bravely). -# -# On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh -# In general: bash or ksh will work -# -GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') - -# Path of bash for bash specific plugins -BASH := /bin/bash - -# Server only - Where to install the perl libraries -PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2) -PERLLIB = $(DESTDIR)$(PERLSITELIB) - -# Client only - Install plugins for this architecture -OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') - -# How to figure out the hostname. (Only used in default configuration -# files) -HOSTNAME := myhostname - -# What is the safest way to create a tempfile. -# Default is to figure it out by testing various methods. -# Replace this with a known platform-specific method -MKTEMP := $(shell ./test-mktemp) - -# Munin version number. -VERSION := $(shell ./getversion) - -# User to run munin as -USER := munin -GROUP := munin - -# Default user to run the plugins as -PLUGINUSER := nobody - -# Which command to use to check if the USER and GROUP to run Munin as, exists. -GETENT := /bin/true -CHECKUSER := /bin/true -CHECKGROUP := /bin/true - -CHOWN := true -CHMOD := chmod -CHGRP := true - -# Java compiler stuff - only needed on the buildhost -JC := javac -JFLAGS := -g -source 1.5 -target 1.5 -JAR := jar - -# Check if the java compiler works -JCVALID := no - -# Check whether setruid functionality can be used -HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) Copied: munin/repos/extra-any/Makefile.config (from rev 165500, munin/trunk/Makefile.config) =================================================================== --- Makefile.config (rev 0) +++ Makefile.config 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,138 @@ +# -*- makefile -*- +# This file specifies where Munin will look for things after you've +# run 'make' in the source directory. Modify it to suit your needs. + +# DESTDIR is meant only for use when making Munin packages. Unless +# you're doing packaging do NOT set it. +# DESTDIR is empty during building, and optionally set to point to +# a shadow tree during make install. + +# Note: There is a need for a VARDIR, with DBDIR, PLUGSTATE, HTMLDIR +# and LOGDIR as subdirectories. Today, DBDIR contains configured +# domains, as well as PLUGSTATE, and we risk collisions. + +# +# the base of the Munin installation. +# +PREFIX = $(DESTDIR) + +# Where Munin keeps its configurations (server.conf, client.conf, ++) +CONFDIR = $(DESTDIR)/etc/munin + +# Server only - where to put munin-cron +BINDIR = $(PREFIX)/usr/bin + +# Client only - where to put munin-node, munin-node-configure, and munin-run +SBINDIR = $(PREFIX)/usr/bin + +# Where to put text and html documentation +DOCDIR = $(PREFIX)/usr/share/doc/munin + +# Where to put man pages +MANDIR = $(PREFIX)/usr/share/man + +# Where to put internal binaries and plugin repository +LIBDIR = $(PREFIX)/usr/lib/munin + +# Server only - Output directory +HTMLDIR = $(PREFIX)/usr/share/munin/www +CGIDIR = $(PREFIX)/usr/share/munin/cgi + +# Where to put RRD files and other internal data, both master and node +DBDIR = $(DESTDIR)/var/lib/munin + +# Client only - Where the spool files are written. Must be writable by +# group "munin", and should be preserved between reboots +SPOOLDIR = $(DBDIR)/spool + +# Client only - Where plugins should put their states. Must be writable by +# group "munin", and should be preserved between reboots +PLUGSTATE = $(DBDIR)/plugin-state + +# Where Munin should place its logs. +LOGDIR = $(PREFIX)/var/log/munin + +# Location of PID files and other statefiles. On the server, must be +# writable by the user "munin". +STATEDIR = $(DESTDIR)/run/munin + +# The perl interpreter to use +PERL := /usr/bin/perl + +# The python interpreter to use (used by some plugins) +PYTHON := /usr/bin/env python2 + +# The ruby interpreter to use (used by some plugins) +RUBY := /usr/bin/env ruby + +# The java runtime to use (used by some plugins) +JAVARUN := /usr/bin/java + +# The java library dir to use (used by some plugins) +# this is needed in order to be able to install +# java libraries in a custom location. Many distrubutions +# enforce a spesific location for java libraries. +JAVALIBDIR:= $(LIBDIR) + + +# A modern (posix) shell. We're not looking for arrays, but $() and +# other modern stuff is expected. On a posix-system the expression +# below will find the right shell. Most Unixes released the last 10 +# years are POSIX compliant enough for this to work (he said bravely). +# +# On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh +# In general: bash or ksh will work +# +GOODSH := /bin/sh + +# Path of bash for bash specific plugins +BASH := /bin/bash + +# Server only - Where to install the perl libraries +PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2) +PERLLIB = $(DESTDIR)$(PERLSITELIB) + +# Client only - Install plugins for this architecture +OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') + +# How to figure out the hostname. (Only used in default configuration +# files) +HOSTNAME := myhostname + +# What is the safest way to create a tempfile. +# Default is to figure it out by testing various methods. +# Replace this with a known platform-specific method +MKTEMP := $(shell ./test-mktemp) + +# Munin version number. +VERSION := $(shell ./getversion) + +# User to run munin as +USER := munin +GROUP := munin + +# Default user to run the plugins as +PLUGINUSER := nobody + +# Default user to run the cgi as +CGIUSER := nobody + +# Which command to use to check if the USER and GROUP to run Munin as, exists. +GETENT := /bin/true +CHECKUSER := /bin/true +CHECKGROUP := /bin/true + +CHOWN := true +CHMOD := chmod +CHGRP := true + +# Java compiler stuff - only needed on the buildhost +JC := javac +JFLAGS := -g -source 1.5 -target 1.5 +JAR := jar + +# Check if the java compiler works +JCVALID := no + +# Check whether setruid functionality can be used +HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-08-21 14:04:52 UTC (rev 165500) +++ PKGBUILD 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,76 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> -# Contributor: Evan LeCompte <evan...@gmail.com> - -pkgname=('munin' 'munin-node') -pkgbase=munin -pkgver=1.4.7 -_realver=1.4.7 -pkgrel=1 -pkgdesc="A distributed monitoring/graphing tool" -arch=('any') -url="http://munin-monitoring.org/" -license=("GPL") -depends=('rrdtool' 'perl' 'perl-log-log4perl' 'perl-html-template' 'perl-date-manip') -source=(http://downloads.sourceforge.net/sourceforge/munin/munin-$_realver.tar.gz - Makefile.config - keep-defaults.patch - munin-lock-location.patch - munin-df-linux-excludes.patch - munin-cron-entry - munin-node.init - logrotate.munin - logrotate.munin-node - 08-munin-font-dir.conf) - -build() { - cd "$srcdir/munin-$_realver" - # This build is beyond fucked, also need to report this upstream - patch -Np1 < ../keep-defaults.patch - patch -Np1 < ../munin-lock-location.patch - patch -Np0 < ../munin-df-linux-excludes.patch - - sed -i -e 's#/sbin/ip6tables#/usr/sbin/ip6tables#' plugins/node.d.linux/ip_.in - - cp ../Makefile.config . - # multithreading wrecks havoc on the build, should probably report this - make -j1 PREFIX='' -} - -package_munin() { - depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip' 'perl-log-log4perl' 'munin-node') - backup=(etc/munin/munin.conf etc/logrotate.d/munin) - install=munin.install - - cd "$srcdir/munin-$_realver" - make DESTDIR="$pkgdir" install-master-prime - install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry - install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin - install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf - rm -rf "$pkgdir/var/run/" -} - -package_munin-node() { - depends=('perl' 'perl-net-server') - optdepends=('perl-net-snmp: for SNMP plugins' - 'perl-net-ssleay: for SSL/TLS support') - backup=(etc/munin/munin-node.conf etc/logrotate.d/munin-node) - install=munin-node.install - - cd "$srcdir/munin-$_realver" - make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime - install -D -m755 ../munin-node.init "$pkgdir"/etc/rc.d/munin-node - install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node - rm -rf "$pkgdir/var/run/" -} - -md5sums=('bb61f2022d215e8a3bbe4a7a4b77bc43' - 'df9b86e3057b0f563149fe06e7f7b50a' - '7d318c55b33680b14f236c5c06a0a64b' - '97d787260f075c5edef898e6919ce871' - '5dc77899bfb13bfc9df8a757b05ebbb2' - 'dc9c83aa2a278466fb475364462f4119' - '683627bd0f0c0d1e146dde7d246b6b3c' - 'db77b53150a906256a71a9f539c7fac2' - 'cdf139f2b6ae36852113f3411caa6e99' - 'e33a45c3b80a83eecabbe5a9920c1eb6') Copied: munin/repos/extra-any/PKGBUILD (from rev 165500, munin/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> +# Contributor: Evan LeCompte <evan...@gmail.com> + +pkgname=('munin' 'munin-node') +pkgbase=munin +pkgver=2.0.4 +pkgrel=1 +pkgdesc="A distributed monitoring/graphing tool" +arch=('any') +url="http://munin-monitoring.org/" +license=("GPL") +makedepends=('perl' 'rrdtool' 'perl-log-log4perl' 'perl-html-template' + 'perl-date-manip' 'perl-io-socket-inet6' 'perl-net-snmp' + 'perl-net-ssleay' 'perl-net-server' 'perl-file-copy-recursive' + 'perl-fcgi') +source=(http://downloads.sourceforge.net/sourceforge/munin/munin-$pkgver.tar.gz + Makefile.config + munin-cron-entry + munin-node.init + logrotate.munin + logrotate.munin-node + munin.tmpfiles.conf + 08-munin-font-dir.conf) + +build() { + cd "$srcdir/munin-$pkgver" + + sed -i -e 's#/sbin/ip6tables#/usr/sbin/ip6tables#' plugins/node.d.linux/ip_.in + + cp ../Makefile.config . + # multithreading wrecks havoc on the build, should probably report this + make -j1 PREFIX='' +} + +package_munin() { + depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip' + 'perl-log-log4perl' 'perl-io-socket-inet6' + 'perl-file-copy-recursive' 'perl-fcgi' 'munin-node') + backup=(etc/munin/munin.conf etc/logrotate.d/munin) + install=munin.install + + cd "$srcdir/munin-$pkgver" + make DESTDIR="$pkgdir" install-master-prime + install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry + install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin + install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin.conf + install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf + rm -rf "$pkgdir/run" +} + +package_munin-node() { + depends=('perl' 'perl-net-server') + optdepends=('perl-net-snmp: for SNMP plugins' + 'perl-net-ssleay: for SSL/TLS support' + 'python2: for some plugins' + 'ruby: for some plugins') + backup=(etc/munin/munin-node.conf etc/logrotate.d/munin-node) + install=munin-node.install + + cd "$srcdir/munin-$pkgver" + make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime + install -D -m755 ../munin-node.init "$pkgdir"/etc/rc.d/munin-node + install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node + install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf + rm -rf "$pkgdir/run/" +} + +md5sums=('5efd93a070159f4554242a0ba38eb0b1' + 'fb3cc403e298ae6b73c280c4d3af7b49' + 'dc9c83aa2a278466fb475364462f4119' + '24a5fc7192729484c5190ddd76a3e9ab' + 'eb2f1e6e746e85ce1e91111f40086be0' + 'cdf139f2b6ae36852113f3411caa6e99' + 'd124f46e353a7966df093ba803235789' + 'e33a45c3b80a83eecabbe5a9920c1eb6') Deleted: keep-defaults.patch =================================================================== --- keep-defaults.patch 2012-08-21 14:04:52 UTC (rev 165500) +++ keep-defaults.patch 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,23 +0,0 @@ ---- munin-1.4.4/Makefile.old 2010-05-13 12:17:36.000000000 -0500 -+++ munin-1.4.4/Makefile 2010-05-13 12:19:06.000000000 -0500 -@@ -225,9 +225,9 @@ - - build-common-pre: common/Build - cd common && $(PERL) Build code -- rm -f common/blib/lib/Munin/Common/Defaults.pm - - 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{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \ -@@ -383,9 +383,6 @@ - build-%: %/Build - cd $* && $(PERL) Build - --build-common: common/Build -- cd common && $(PERL) Build && rm -f common/blib/lib/Munin/Common/Defaults.pm && true -- - - # BUG: the Build script writes files under PWD when it does "install" - # can't seem to find a way to persuade it to write otherwhere. Deleted: logrotate.munin =================================================================== --- logrotate.munin 2012-08-21 14:04:52 UTC (rev 165500) +++ logrotate.munin 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,4 +0,0 @@ -/var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log /var/log/munin/munin-update.log { - copytruncate - missingok -} Copied: munin/repos/extra-any/logrotate.munin (from rev 165500, munin/trunk/logrotate.munin) =================================================================== --- logrotate.munin (rev 0) +++ logrotate.munin 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,4 @@ +/var/log/munin/munin-graph.log /var/log/munin/munin-cgi-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log /var/log/munin/munin-update.log { + copytruncate + missingok +} Deleted: logrotate.munin-node =================================================================== --- logrotate.munin-node 2012-08-21 14:04:52 UTC (rev 165500) +++ logrotate.munin-node 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,4 +0,0 @@ -/var/log/munin/munin-node.log { - copytruncate - missingok -} Copied: munin/repos/extra-any/logrotate.munin-node (from rev 165500, munin/trunk/logrotate.munin-node) =================================================================== --- logrotate.munin-node (rev 0) +++ logrotate.munin-node 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,4 @@ +/var/log/munin/munin-node.log { + copytruncate + missingok +} Deleted: munin-cron-entry =================================================================== --- munin-cron-entry 2012-08-21 14:04:52 UTC (rev 165500) +++ munin-cron-entry 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,6 +0,0 @@ -# -# cron-jobs for munin -# - -*/5 * * * * test -x /usr/bin/munin-cron && /usr/bin/munin-cron - Copied: munin/repos/extra-any/munin-cron-entry (from rev 165500, munin/trunk/munin-cron-entry) =================================================================== --- munin-cron-entry (rev 0) +++ munin-cron-entry 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,6 @@ +# +# cron-jobs for munin +# + +*/5 * * * * test -x /usr/bin/munin-cron && /usr/bin/munin-cron + Deleted: munin-df-linux-excludes.patch =================================================================== --- munin-df-linux-excludes.patch 2012-08-21 14:04:52 UTC (rev 165500) +++ munin-df-linux-excludes.patch 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,62 +0,0 @@ -Index: plugins/node.d.linux/df.in -=================================================================== ---- plugins/node.d.linux/df.in (revision 4638) -+++ plugins/node.d.linux/df.in (working copy) -@@ -14,7 +14,7 @@ - The plugin excludes per default the following special, read-only or - dynamically allocating file systems from graphing: - -- none unknown iso9660 squashfs udf romfs ramfs -+ none unknown iso9660 squashfs udf romfs ramfs debugfs simfs rootfs - - To change this set the environment variable "exclude" with a list of - space separated fs types. The environment variables "warning" and -@@ -24,7 +24,7 @@ - This configuration snipplet is an example with the defaults: - - [df] -- env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs -+ env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs simfs rootfs - env.warning 92 - env.critical 98 - -@@ -87,7 +87,7 @@ - # For these devices use the mount point, the device is useless - my %usemntpt = ( tmpfs => 1, none => 1, udev => 1 ); - --my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs debugfs simfs'; -+my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs debugfs simfs rootfs'; - my $dfopts = "-P -l ".join(' -x ',('',split('\s+',$exclude))); - - my $mode = ($ARGV[0] or "print"); -Index: plugins/node.d.linux/df_inode.in -=================================================================== ---- plugins/node.d.linux/df_inode.in (revision 4638) -+++ plugins/node.d.linux/df_inode.in (working copy) -@@ -14,7 +14,7 @@ - The plugin excludes per default the following special, read-only or - dynamically allocating file systems from graphing: - -- none unknown iso9660 squashfs udf romfs ramfs -+ none unknown iso9660 squashfs udf romfs ramfs vfat debugfs simfs nilfs2 rootfs - - To change this set the environment variable "exclude" with a list of - space separated fs types. The environment variables "warning" and -@@ -24,7 +24,7 @@ - This configuration snipplet is an example with the defaults: - - [df_inode] -- env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs -+ env.exclude none unknown iso9660 squashfs udf romfs ramfs vfat debugfs simfs nilfs2 rootfs - env.warning 92 - env.critical 98 - -@@ -87,7 +87,7 @@ - # For these devices use the mount point, the device is useless - my %usemntpt = ( tmpfs => 1, none => 1, udev => 1 ); - --my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs vfat debugfs simfs'; -+my $exclude = $ENV{'exclude'} || 'none unknown iso9660 squashfs udf romfs ramfs vfat debugfs simfs nilfs2 rootfs'; - my $dfopts = "-P -l -i ".join(' -x ',('',split('\s+',$exclude))); - - my $mode = ($ARGV[0] or "print"); Deleted: munin-lock-location.patch =================================================================== --- munin-lock-location.patch 2012-08-21 14:04:52 UTC (rev 165500) +++ munin-lock-location.patch 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,85 +0,0 @@ -diff -Naur munin-1.4.5-orig//common/lib/Munin/Common/Defaults.pm munin-1.4.5/common/lib/Munin/Common/Defaults.pm ---- munin-1.4.5-orig//common/lib/Munin/Common/Defaults.pm 2009-11-10 14:13:54.000000000 -0600 -+++ munin-1.4.5/common/lib/Munin/Common/Defaults.pm 2011-04-09 15:09:13.215722026 -0500 -@@ -30,6 +30,7 @@ - our $MUNIN_MANDIR = ''; - our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; - our $MUNIN_STATEDIR = ''; -+our $MUNIN_LOCKDIR = ''; - our $MUNIN_USER = getpwuid $UID; - our $MUNIN_GROUP = getgrgid $GID; - our $MUNIN_PLUGINUSER = getpwuid $UID; -diff -Naur munin-1.4.5-orig//Makefile munin-1.4.5/Makefile ---- munin-1.4.5-orig//Makefile 2009-12-29 10:03:49.000000000 -0600 -+++ munin-1.4.5/Makefile 2011-04-09 15:20:44.201098440 -0500 -@@ -199,6 +199,7 @@ - -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \ - -e 's|@@DBDIR@@|$(DBDIR)|g' \ - -e 's|@@STATEDIR@@|$(STATEDIR)|g' \ -+ -e 's|@@LOCKDIR@@|$(LOCKDIR)|g' \ - -e 's|@@PERL@@|$(PERL)|g' \ - -e 's|@@PERLLIB@@|$(PERLLIB)|g' \ - -e 's|@@PYTHON@@|$(PYTHON)|g' \ -@@ -239,6 +240,7 @@ - s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \ - s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \ - s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \ -+ s{(LOCKDIR \s+=\s).*}{\1q{$(LOCKDIR)};}x; \ - s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \ - s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \ - s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \ -diff -Naur munin-1.4.5-orig//Makefile.config munin-1.4.5/Makefile.config ---- munin-1.4.5-orig//Makefile.config 2009-11-06 08:35:44.000000000 -0600 -+++ munin-1.4.5/Makefile.config 2011-04-09 15:11:15.669416316 -0500 -@@ -61,10 +61,13 @@ - # Where Munin should place its logs. - LOGDIR = $(PREFIX)/log/munin - --# Location of PID files and other statefiles. On the server, must be --# writable by the user "munin". -+# Location of PID files and other statefiles. - STATEDIR = $(DESTDIR)/var/run/munin - -+# Location of server lock files. On the server, must be writable by the user -+# "munin". -+LOCKDIR = $(DESTDIR)/var/lock/munin -+ - # The perl interpreter to use - PERL := $(shell which perl) - -diff -upr munin-1.4.5.orig/master/lib/Munin/Master/Config.pm munin-1.4.5/master/lib/Munin/Master/Config.pm ---- munin-1.4.5.orig/master/lib/Munin/Master/Config.pm 2011-06-20 12:08:45.000000000 +0300 -+++ munin-1.4.5/master/lib/Munin/Master/Config.pm 2011-06-20 12:09:29.000000000 +0300 -@@ -148,7 +148,7 @@ my %booleans = map {$_ => 1} qw( - local_address => 0, - logdir => $Munin::Common::Defaults::MUNIN_LOGDIR, - max_processes => $MAXINT, -- rundir => $Munin::Common::Defaults::MUNIN_STATEDIR, -+ rundir => $Munin::Common::Defaults::MUNIN_LOCKDIR, - timeout => 180, - tls => 'disabled', - tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem", -diff -Naur munin-1.4.5-orig//master/lib/Munin/Master/Utils.pm munin-1.4.5/master/lib/Munin/Master/Utils.pm ---- munin-1.4.5-orig//master/lib/Munin/Master/Utils.pm 2009-12-18 00:25:03.000000000 -0600 -+++ munin-1.4.5/master/lib/Munin/Master/Utils.pm 2011-04-09 15:05:57.965152601 -0500 -@@ -270,7 +270,7 @@ - - # Some important defaults before we return... - $config->{'dropdownlimit'} ||= $Munin::Common::Defaults::DROPDOWNLIMIT; -- $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR; -+ $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_LOCKDIR; - $config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR; - $config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR; - $config->{'tmpldir'} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/"; -diff -Naur munin-1.4.5-orig//master/munin.conf.in munin-1.4.5/master/munin.conf.in ---- munin-1.4.5-orig//master/munin.conf.in 2009-11-23 06:26:36.000000000 -0600 -+++ munin-1.4.5/master/munin.conf.in 2011-04-09 15:18:04.650625378 -0500 -@@ -8,7 +8,7 @@ - # dbdir @@DBDIR@@ - # htmldir @@HTMLDIR@@ - # logdir @@LOGDIR@@ --# rundir @@STATEDIR@@ -+# rundir @@LOCKDIR@@ - # - # Where to look for the HTML templates - # tmpldir @@CONFDIR@@/templates Deleted: munin-node.init =================================================================== --- munin-node.init 2012-08-21 14:04:52 UTC (rev 165500) +++ munin-node.init 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/munin-node` -# set the path to prevent insecure path warnings from perl -T -PATH='/bin:/usr/bin:/sbin:/usr/sbin' - -case "$1" in - start) - stat_busy "Starting munin-node" - [ -d /var/run/munin ] || mkdir -p /var/run/munin - /usr/sbin/munin-node >/dev/null - stat_done - add_daemon munin-node - ;; - stop) - stat_busy "Stopping munin-node" - if [ ! -z "$PID" ]; then - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - stat_done - rm_daemon munin-node - fi - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac Copied: munin/repos/extra-any/munin-node.init (from rev 165500, munin/trunk/munin-node.init) =================================================================== --- munin-node.init (rev 0) +++ munin-node.init 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID munin-node` +# set the path to prevent insecure path warnings from perl -T +PATH='/bin:/usr/bin:/sbin:/usr/sbin' + +case "$1" in + start) + stat_busy "Starting munin-node" + [ -d /var/run/munin ] || mkdir -p /var/run/munin + munin-node >/dev/null + stat_done + add_daemon munin-node + ;; + stop) + stat_busy "Stopping munin-node" + if [ ! -z "$PID" ]; then + kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + stat_done + rm_daemon munin-node + fi + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac Deleted: munin-node.install =================================================================== --- munin-node.install 2012-08-21 14:04:52 UTC (rev 165500) +++ munin-node.install 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,17 +0,0 @@ -post_install () { - # Check user/group munin exists - getent group munin >/dev/null || groupadd --system munin - getent passwd munin >/dev/null || \ - useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin - # Do basic configuration - echo "==> Run the following to get a good set of default plugins:" - echo " /usr/sbin/munin-node-configure --shell | sh" - post_upgrade -} - -post_upgrade() { - # Ensure directories exist - mkdir -p /var/{lib,log}/munin - # Fix permissions on necessary directories - chown munin.munin -R /var/{lib,log}/munin -} Copied: munin/repos/extra-any/munin-node.install (from rev 165500, munin/trunk/munin-node.install) =================================================================== --- munin-node.install (rev 0) +++ munin-node.install 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,17 @@ +post_install () { + # Check user/group munin exists + getent group munin >/dev/null || groupadd --system munin + getent passwd munin >/dev/null || \ + useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin + # Do basic configuration + echo "==> Run the following to get a good set of default plugins:" + echo " munin-node-configure --shell | sh" + post_upgrade +} + +post_upgrade() { + # Ensure directories exist + mkdir -p /var/{lib,log}/munin /run/munin + # Fix permissions on necessary directories + chown munin.munin -R /var/{lib,log}/munin /run/munin +} Deleted: munin.install =================================================================== --- munin.install 2012-08-21 14:04:52 UTC (rev 165500) +++ munin.install 2012-08-21 14:05:23 UTC (rev 165501) @@ -1,22 +0,0 @@ -post_install () { - # Check user/group munin exists - getent group munin >/dev/null || groupadd --system munin - getent passwd munin >/dev/null || \ - useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin - # Display cron command - echo "See the example cron entry (for the munin user) for further setup: - /etc/munin/munin-cron-entry" - post_upgrade -} - -post_upgrade() { - # Ensure directories exist - mkdir -p /var/{lib,log}/munin - # Fix permissions on necessary directories - chown munin.munin -R /var/{lib,log}/munin - fc-cache -fs -} - -post_remove() { - fc-cache -fs -} Copied: munin/repos/extra-any/munin.install (from rev 165500, munin/trunk/munin.install) =================================================================== --- munin.install (rev 0) +++ munin.install 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1,22 @@ +post_install () { + # Check user/group munin exists + getent group munin >/dev/null || groupadd --system munin + getent passwd munin >/dev/null || \ + useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin + # Display cron command + echo "See the example cron entry (for the munin user) for further setup: + /etc/munin/munin-cron-entry" + post_upgrade +} + +post_upgrade() { + # Ensure directories exist + mkdir -p /var/{lib,log}/munin /run/munin + # Fix permissions on necessary directories + chown munin.munin -R /var/{lib,log}/munin /run/munin + fc-cache -fs +} + +post_remove() { + fc-cache -fs +} Copied: munin/repos/extra-any/munin.tmpfiles.conf (from rev 165500, munin/trunk/munin.tmpfiles.conf) =================================================================== --- munin.tmpfiles.conf (rev 0) +++ munin.tmpfiles.conf 2012-08-21 14:05:23 UTC (rev 165501) @@ -0,0 +1 @@ +d /run/munin 0755 munin munin -