From c5d9d8f0eba0045c48ff691f94b633949f5cbb32 Mon Sep 17 00:00:00 2001 From: Steve Schnepp Date: Sun, 25 Nov 2012 20:35:01 +0100 Subject: [PATCH] dists: remove all dists specific stuff Since the move to git, it's much more practical to have an official repository as "clean" as possible. Therefore, I'm putting all packaging specifics outside the repo, explaining where to find it. This only makes official what happened since a while, as the dists/ dir is no accurate anymore. Note that we work even more closely with packagers than before. This enables a much faster integration and factoring of patches, as it factors out much of the noise. --- dists/README | 59 ++++ dists/debian/README | 22 -- dists/freebsd/munin-main/Makefile | 62 ---- dists/freebsd/munin-main/distinfo | 2 - dists/freebsd/munin-main/files/patch-Makefile | 11 - .../munin-main/files/patch-Makefile.config | 86 ------ .../munin-main/files/patch-munin-limits.in | 35 --- dists/freebsd/munin-main/files/pkg-message.in | 10 - dists/freebsd/munin-main/pkg-deinstall | 116 ------- dists/freebsd/munin-main/pkg-descr | 14 - dists/freebsd/munin-main/pkg-install | 121 -------- dists/freebsd/munin-main/pkg-plist | 54 ---- dists/freebsd/munin-node/Makefile | 68 ----- dists/freebsd/munin-node/distinfo | 2 - .../munin-node/files/munin-node-revive.sh.in | 27 -- .../freebsd/munin-node/files/munin-node.sh.in | 28 -- dists/freebsd/munin-node/files/munin_node.sh | 28 -- dists/freebsd/munin-node/files/patch-Makefile | 10 - .../munin-node/files/patch-Makefile.config | 86 ------ dists/freebsd/munin-node/files/patch-cpu.in | 15 - .../munin-node/files/patch-munin-node.conf.in | 11 - dists/freebsd/munin-node/files/patch-ping_.in | 23 -- .../files/patch-sendmail_mailtraffic.in | 11 - .../freebsd/munin-node/files/patch-vmstat.in | 29 -- dists/freebsd/munin-node/files/pkg-message.4 | 12 - dists/freebsd/munin-node/files/pkg-message.in | 21 -- dists/freebsd/munin-node/files/plugins.conf | 37 --- dists/freebsd/munin-node/pkg-deinstall | 85 ------ dists/freebsd/munin-node/pkg-descr | 13 - dists/freebsd/munin-node/pkg-install | 91 ------ dists/freebsd/munin-node/pkg-plist | 138 --------- dists/redhat/README | 4 - dists/sunos/Makefile | 133 -------- dists/sunos/README | 1 - dists/sunos/postinstall.node | 3 - dists/sunos/preinstall.main | 4 - dists/sunos/preinstall.node | 3 - dists/suse/Makefile.config | 20 -- dists/suse/munin-node.cron.d | 6 - dists/suse/munin-node.rc | 92 ------ dists/suse/munin.cron.d | 7 - dists/suse/munin.spec.in | 287 ------------------ dists/suse/patch-002 | 46 --- dists/tarball/plugins.conf | 33 -- 44 files changed, 59 insertions(+), 1907 deletions(-) create mode 100644 dists/README delete mode 100644 dists/debian/README delete mode 100644 dists/freebsd/munin-main/Makefile delete mode 100644 dists/freebsd/munin-main/distinfo delete mode 100644 dists/freebsd/munin-main/files/patch-Makefile delete mode 100644 dists/freebsd/munin-main/files/patch-Makefile.config delete mode 100644 dists/freebsd/munin-main/files/patch-munin-limits.in delete mode 100644 dists/freebsd/munin-main/files/pkg-message.in delete mode 100755 dists/freebsd/munin-main/pkg-deinstall delete mode 100644 dists/freebsd/munin-main/pkg-descr delete mode 100755 dists/freebsd/munin-main/pkg-install delete mode 100644 dists/freebsd/munin-main/pkg-plist delete mode 100644 dists/freebsd/munin-node/Makefile delete mode 100644 dists/freebsd/munin-node/distinfo delete mode 100644 dists/freebsd/munin-node/files/munin-node-revive.sh.in delete mode 100644 dists/freebsd/munin-node/files/munin-node.sh.in delete mode 100644 dists/freebsd/munin-node/files/munin_node.sh delete mode 100644 dists/freebsd/munin-node/files/patch-Makefile delete mode 100644 dists/freebsd/munin-node/files/patch-Makefile.config delete mode 100644 dists/freebsd/munin-node/files/patch-cpu.in delete mode 100644 dists/freebsd/munin-node/files/patch-munin-node.conf.in delete mode 100644 dists/freebsd/munin-node/files/patch-ping_.in delete mode 100644 dists/freebsd/munin-node/files/patch-sendmail_mailtraffic.in delete mode 100644 dists/freebsd/munin-node/files/patch-vmstat.in delete mode 100644 dists/freebsd/munin-node/files/pkg-message.4 delete mode 100644 dists/freebsd/munin-node/files/pkg-message.in delete mode 100644 dists/freebsd/munin-node/files/plugins.conf delete mode 100644 dists/freebsd/munin-node/pkg-deinstall delete mode 100644 dists/freebsd/munin-node/pkg-descr delete mode 100644 dists/freebsd/munin-node/pkg-install delete mode 100644 dists/freebsd/munin-node/pkg-plist delete mode 100644 dists/redhat/README delete mode 100644 dists/sunos/Makefile delete mode 100644 dists/sunos/README delete mode 100644 dists/sunos/postinstall.node delete mode 100644 dists/sunos/preinstall.main delete mode 100644 dists/sunos/preinstall.node delete mode 100644 dists/suse/Makefile.config delete mode 100644 dists/suse/munin-node.cron.d delete mode 100755 dists/suse/munin-node.rc delete mode 100644 dists/suse/munin.cron.d delete mode 100644 dists/suse/munin.spec.in delete mode 100644 dists/suse/patch-002 delete mode 100644 dists/tarball/plugins.conf diff --git a/dists/README b/dists/README new file mode 100644 index 0000000000..46e60ab87b --- /dev/null +++ b/dists/README @@ -0,0 +1,59 @@ +Thanks to our move to git, dists/ is now obsolete. + +Each distributions has now its own git repository. + +There inner structure is up to them, but we can see 2 pattern emerging : + +1. Fork of official repository + +This is the simplest thing to do. Just fork the official munin repo, and add your distribution specific things. + +It enables a very effective way of sending distro-originated patches upstream. It used to be awkward to use when we where using svn, but the move to git made it a breeze. + +2. Standalone repository + +Some distributions just create a new repo, containing only what's specific to them. It usually takes the form of some build instructions and several patch files. + +It enables a very simple separation of what's coming from upstream and what's ditro originated. It also was the only practical way prior to the git move. + +Some of these specifics were usually integrated here, in dists/*. + +3. Urls reference. + +Please note that we don't know about every distrib. If yours favorite one is missing, just send a patch to add it here. + +Order here is alphabetic, to remain neutral :-) + +* Debian + +Different releases are tracked via different branches. + +type: fork +www: http:// +git: + +* FreeBSD + +type: +www: +git: + +* Gentoo + +type: +www: +git: + +* Redhat and Fedora + +RHEL and Fedora are hosted directly on pkgs.fedoraproject.org. + +type: specific +www: http://pkgs.fedoraproject.org/cgit/munin.git +git: git://pkgs.fedoraproject.org/munin.git + +* Ubuntu + +type: +www: +git: diff --git a/dists/debian/README b/dists/debian/README deleted file mode 100644 index ffb7320d1c..0000000000 --- a/dists/debian/README +++ /dev/null @@ -1,22 +0,0 @@ -For Debian packaging trunk/dists/debian is _deprecated_. - -A branch for svn-buildpackage has been created at branches/debian, -with subdirectories for each release codename: - -svn ls svn://munin-monitoring.org/munin/branches/debian - -This works with using released tarballs which are available in -munin/branches/debian/$codename/tarballs/ - -############################################################################ - -For working with munin SVN trunk, the easiest way is to checkout -squeeze/trunk/debian in the munin trunk directory as debian: - -$ svn co http://munin-monitoring.org/svn/munin/trunk/ munin-trunk -$ cd munin-trunk -$ svn co http://munin-monitoring.org/svn/munin/branches/debian/squeeze/trunk/debian/ debian - -Now dpkg-buildpackage should work flawlessly, but as this is trunk, it might -not :-) - diff --git a/dists/freebsd/munin-main/Makefile b/dists/freebsd/munin-main/Makefile deleted file mode 100644 index f6982889cc..0000000000 --- a/dists/freebsd/munin-main/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# New ports collection makefile for: munin-main -# Date created: 25 Januar 2004 -# Whom: Lupe Christoph -# -# $FreeBSD: ports/sysutils/munin-main/Makefile,v 1.7 2004/12/14 01:43:10 sem Exp $ -# - -PORTNAME= munin -PORTVERSION= 1.2.2 -CATEGORIES= sysutils perl5 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= munin -PKGNAMESUFFIX= -main -DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/} - -MAINTAINER= lupe@lupe-christoph.de -COMMENT= Collector part of Munin - -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool \ - ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \ - ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ - ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip -BUILD_DEPENDS= ${RUN_DEPENDS} - -.include - -.if ${PERL_LEVEL} <= 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ - ${SITE_PERL}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced -.endif - -USE_GMAKE= yes -PATCH_STRIP= -p1 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} -PKGMESSAGE= ${WRKDIR}/pkg-message -ALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} build build-man -INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} install-main - -MAN5= munin.conf.5 -MAN8= munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 - -SUB_FILES=pkg-message - -pre-install: - @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL - -post-install: - @${INSTALL_DATA} ${WRKSRC}/build/server/munin.conf ${PREFIX}/etc/munin/munin.conf.sample - @for man in ${MAN5}; do \ - ${INSTALL_MAN} -C ${WRKSRC}/build/doc/$$man ${PREFIX}/man/man5; \ - done - @for man in ${MAN8}; do \ - ${INSTALL_MAN} -C ${WRKSRC}/build/doc/$$man ${PREFIX}/man/man8; \ - done - @DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL - @${CHOWN} munin /var/log/munin-main - @${CHGRP} munin /var/run/munin /var/log/munin-main ${PREFIX}/www/data/munin ${PREFIX}/var/munin - @${CAT} ${PKGMESSAGE} - -.include diff --git a/dists/freebsd/munin-main/distinfo b/dists/freebsd/munin-main/distinfo deleted file mode 100644 index adf9dc7da3..0000000000 --- a/dists/freebsd/munin-main/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (munin_1.2.2.tar.gz) = e55ff3cc8d506558f32598f639952cca -SIZE (munin_1.2.2.tar.gz) = 325356 diff --git a/dists/freebsd/munin-main/files/patch-Makefile b/dists/freebsd/munin-main/files/patch-Makefile deleted file mode 100644 index e67b632a10..0000000000 --- a/dists/freebsd/munin-main/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Tue May 11 22:23:06 2004 -+++ Makefile Fri Jun 4 00:25:54 2004 -@@ -26,7 +26,7 @@ - mkdir -p $(HTMLDIR) - mkdir -p $(DBDIR) - -- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) -+ $(CHOWN) $(USER) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) - - for p in server/*.tmpl; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ diff --git a/dists/freebsd/munin-main/files/patch-Makefile.config b/dists/freebsd/munin-main/files/patch-Makefile.config deleted file mode 100644 index 5aa88e9652..0000000000 --- a/dists/freebsd/munin-main/files/patch-Makefile.config +++ /dev/null @@ -1,86 +0,0 @@ ---- munin-1.1.7.orig/Makefile.config 2004-11-23 19:52:38.000000000 +0100 -+++ munin-1.1.7/Makefile.config 2004-11-27 12:46:19.000000000 +0100 -@@ -7,52 +7,56 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+ifdef PREFIX -+UPREFIX=$(PREFIX) -+else -+UPREFIX=/usr -+endif - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR = $(PREFIX)/etc/munin - - # Server only - where to put munin-cron --BINDIR = $(PREFIX)/bin -+BINDIR = $(UPREFIX)/bin - - # Client only - where to put munin-node, munin-node-configure, and munin-run --SBINDIR = $(PREFIX)/sbin -+SBINDIR = $(UPREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(UPREFIX)/doc - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(UPREFIX)/man - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(DATADIR) - - # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www --CGIDIR = $(HTMLDIR)/cgi -+HTMLDIR = $(PREFIX)/www/data/munin -+CGIDIR = $(PREFIX)/www/cgi-bin - - # Client only - Where to put RRD files and other intenal data --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = $(PREFIX)/var/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 -+LOGDIR = /var/log/munin-main - - # Location of PID files and other statefiles. On the server, must be - # writable by the user "munin". --STATEDIR = $(DESTDIR)/var/run/munin -+STATEDIR = /var/run/munin - - # The perl interpreter to use --PERL = $(shell which perl) -+# Passed in from FreeBSD port Makefile. - - # The python interpreter to use (used by some plugins) --PYTHON = $(shell which python || echo /usr/bin/python) -+PYTHON = $(shell which python || echo /usr/local/bin/python) - - # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") -+PERLLIB = $(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") - - # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -69,9 +73,8 @@ - GROUP = munin - - # Which command to use to check if the USER and GROUP to run Munin as, exists. --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) -+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - CHOWN = chown - CHMOD = chmod diff --git a/dists/freebsd/munin-main/files/patch-munin-limits.in b/dists/freebsd/munin-main/files/patch-munin-limits.in deleted file mode 100644 index 7fc5202675..0000000000 --- a/dists/freebsd/munin-main/files/patch-munin-limits.in +++ /dev/null @@ -1,35 +0,0 @@ ---- munin-1.2.0.orig/server/munin-limits.in Wed Feb 16 21:03:31 2005 -+++ munin-1.2.0/server/munin-limits.in Wed Feb 23 09:06:26 2005 -@@ -18,6 +18,12 @@ - # - # - # $Log: munin-limits.in,v $ -+# Revision 1.24.2.4 2005/02/19 16:06:14 ilmari -+# Place the munin-limits lock file in rundir, not dbdir. -+# -+# Revision 1.24.2.3 2005/02/19 16:04:03 ilmari -+# Fix the file vs. pipe check in munin-limits -+# - # Revision 1.24.2.2 2005/02/16 20:03:31 jimmyo - # yet another rewrite of munin-limits open call (SF#1115434). - # -@@ -179,8 +185,8 @@ - my $modified=0; - - logger("Starting munin-limits, checking lock"); --munin_runlock("$config->{dbdir}/munin-limits.lock"); --logger("Created lock: $config->{dbdir}/munin-limits.lock"); -+munin_runlock("$config->{rundir}/munin-limits.lock"); -+logger("Created lock: $config->{rundir}/munin-limits.lock"); - - if (!defined $config->{'contact'}->{'nagios'}->{'command'} and - defined $config->{'nsca'}) -@@ -458,7 +464,7 @@ - unshift (@cmd, "|-"); - } - logger ("Debug: opening for writing: \"" . join('" "',@cmd) . "\".") if $DEBUG; -- if ($cmd[0] == ">") -+ if ($cmd[0] eq ">") - { - if (! open ($pipe, join (' ', @cmd))) - { diff --git a/dists/freebsd/munin-main/files/pkg-message.in b/dists/freebsd/munin-main/files/pkg-message.in deleted file mode 100644 index 2d56e5464b..0000000000 --- a/dists/freebsd/munin-main/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ - -******************************************************************** -Unless this file already existed, a sample configuration file -has been placed in %%PREFIX%%/etc/munin/munin.conf. - -Please edit it according to your needs. - -The Munin server will be run from cron under the user 'munin'. -******************************************************************** - diff --git a/dists/freebsd/munin-main/pkg-deinstall b/dists/freebsd/munin-main/pkg-deinstall deleted file mode 100755 index 5040286854..0000000000 --- a/dists/freebsd/munin-main/pkg-deinstall +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -delete_account() { - local u g home - - u=$1 - g=$2 - if pw group show ${g} > /dev/null 2>&1; then - if yesno "Do you want me to remove group \"${g}\"" y; then - pw group del -n ${g} - echo "Done." - else - GID=`pw group show ${g} | awk -F: '{ print $3 }'` - fi - fi - if pw user show ${u} > /dev/null 2>&1; then - if yesno "Do you want me to remove user \"${u}\"" y; then - eval home=~${u} - pw user del -n ${u} -r - echo "Done." - if [ -d "${home}" ]; then - echo "Please remember to remove the home directory \"${home}\"" - fi - - # pw user del may have removed the group, too. - # Put it back if the admin asked us to retain it. - if [ -n "$GID" ]; then - pw group show ${g} > /dev/null 2>&1 - if [ $? -ne 0 ]; then - pw group add ${g} - fi - fi - fi - fi -} - -delete_crontab_entries() { - local b e - b=$1 - e=$2 - - TMPFILE=`mktemp -t munin` || exit 1 - crontab -u munin -l | sed -e "/^$b\$/,/^$e\$/d" -e '/^[ ]*#/d' -e '/^$/d' > $TMPFILE - if [ -s $TMPFILE ]; then - crontab -u munin -l | sed -e "/^$b\$/,/^$e\$/d" | crontab -u munin - - echo "The crontab for user munin had manually created entries." - echo "Only the automatically created entries have been removed." - echo "These are the remaining lines:" - crontab -u munin -l - else - crontab -u munin -r - echo "crontab for user munin removed" - fi - rm $TMPFILE -} - -delnewsyslog() { - tmp="/etc/#munin-node$$" - sed -e '/^\/var\/log\/munin-main\/\*[ ]/d' /etc/newsyslog.conf >${tmp} - cat ${tmp} > /etc/newsyslog.conf - rm ${tmp} -} - -newsyslog() { - ENTRY=`fgrep '/var/log/munin-main/*' /etc/newsyslog.conf` - DEFAULT='/var/log/munin-main/* munin:munin 644 7 * @T00 GNWZ' - if [ -z "$ENTRY" ]; then - exit 0 - elif [ "$ENTRY" = "$DEFAULT" ]; then - delnewsyslog - elif yesno "You have changed the default munin-main entry in \"/etc/newsyslog.conf\". -Do you want me to delete it?" y; then - delnewsyslog - echo "Done." - fi -} - - -case $2 in - DEINSTALL) - delete_crontab_entries '#BEGIN_MUNIN' '#END_MUNIN' - newsyslog - ;; - POST-DEINSTALL) - delete_account munin munin - ;; -esac diff --git a/dists/freebsd/munin-main/pkg-descr b/dists/freebsd/munin-main/pkg-descr deleted file mode 100644 index 17a7241384..0000000000 --- a/dists/freebsd/munin-main/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Munin network-wide graphing framework (node) - -Munin is a tool for graphing all sorts of information about one or more -servers and displaying it in a web interface. It uses the excellent -RRDTool (written by Tobi Oetiker) and is written in Perl. Munin has a -master/node architecture. The master connects to all the nodes at regular -intervals, and asks them for data. It then stores the data in RRD-files, -and (if needed) updates the graphs. One of the main goals have been ease -of creating own "plugins" (graphs). - -This is the collector. It is installed on the machine that shall collect -and display performance data. - -WWW: http://munin-monitoring.org diff --git a/dists/freebsd/munin-main/pkg-install b/dists/freebsd/munin-main/pkg-install deleted file mode 100755 index c648ed0dc9..0000000000 --- a/dists/freebsd/munin-main/pkg-install +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -make_account() { - local u g gcos - - u=$1 - g=$2 - gcos=$3 - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd ${g} || exit - echo "Done." - else - echo "Please create it, and try again." - if ! grep -q "^${u}:" /etc/passwd; then - echo "While you're at it, please create a user \"${u}\" too," - echo "with a default group of \"${g}\"." - fi - exit 1 - fi - fi - - if pw user show "${u}" >/dev/null 2>&1; then - echo "You already have a user \"${u}\", so I will use it." - else - echo "You need a user \"${u}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd ${u} -g ${g} -h - \ - -s /bin/sh -c "${gcos}" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi -} - -create_crontab_entries() { - local b e - b=$1 - e=$2 - - if [ crontab -u munin -l > /dev/null 2>&1 ]; then - TMPFILE=`mktemp -t munin` || exit 1 - sed -n -e "/^$b\$/,/^$e\$/p" > $TMPFILE - crontab -u munin -l | sed -e '/^#BEGIN_MUNIN$/,/^#END_MUNIN$/d' | \ - cat - $TMPFILE | crontab -u munin - - rm $TMPFILE - else - crontab -u munin - - fi -} - -mklogdir() { -} - -newsyslog() { - if fgrep -q '/var/log/munin-main/*' /etc/newsyslog.conf; then - : - else - cat >> /etc/newsyslog.conf </dev/null || true -@unexec rmdir /var/log/munin-main 2>/dev/null || true -@unexec rmdir %D/www/data/munin 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/share/munin 2>/dev/null || true -@unexec rmdir %D/etc/munin/templates 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true -@unexec echo -@unexec echo '********************************************************************' -@unexec echo "If you want to *completely* remove munin-main, you have to" -@unexec echo -@unexec if [ -d %D/www/data/munin ]; then echo " rm -rf %D/www/data/munin \\"; fi -@unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* | grep -v plugin-state | fmt -40 | sed -e 's/^/ /' -e 's/$/ \\/'; fi -@unexec if [ -f %D/etc/munin/munin.conf ]; then echo " %D/etc/munin/munin.conf \\"; fi -@unexec if [ -d %D/etc/munin/templates ]; then echo " %D/etc/munin/templates \\"; fi -@unexec echo " /var/log/munin-main" -@unexec echo -@unexec echo "If you have already deinstalled munin-node, you can also" -@unexec echo -@unexec echo " rmdir %D/etc/munin %D/var/munin" -@unexec echo -@unexec echo "These files and directories have to be left on the system because" -@unexec echo "you may be performing an update. This process can't tell." -@unexec echo '********************************************************************' -@unexec echo diff --git a/dists/freebsd/munin-node/Makefile b/dists/freebsd/munin-node/Makefile deleted file mode 100644 index b0c13c75f5..0000000000 --- a/dists/freebsd/munin-node/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# New ports collection makefile for: munin-node -# Date created: 25 Januar 2004 -# Whom: Lupe Christoph -# -# $FreeBSD: ports/sysutils/munin-node/Makefile,v 1.12 2004/12/14 01:43:10 sem Exp $ -# - -PORTNAME= munin -PORTVERSION= 1.2.2 -CATEGORIES= sysutils perl5 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= munin -PKGNAMESUFFIX= -node -DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/} - -MAINTAINER= lupe@lupe-christoph.de -COMMENT= Node-specific part of Munin - -RUN_DEPENDS= ${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server -BUILD_DEPENDS= ${RUN_DEPENDS} - -.include - -.if ${OSVERSION} < 500000 -RUN_DEPENDS= ${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr -.endif - -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net -.endif - -USE_GMAKE= yes -PATCH_STRIP= -p1 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/} -PKGMESSAGE= ${WRKDIR}/pkg-message -ALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} build build-man -INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} INSTALL_PLUGINS="auto manual snmpauto" install-node install-node-plugins -MAKE_ENV= LANG=C - -MAN5= munin-node.conf.5 -MAN8= munin-node-configure.8 munin-node.8 munin-run.8 - -SUB_FILES= pkg-message munin-node.sh munin-node-revive.sh -SUB_LIST= RC_SUBR=${RC_SUBR} -USE_RC_SUBR= YES - -pre-install: - @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL - -post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/munin-node.sh ${PREFIX}/etc/rc.d/munin-node.sh -.if ${PERL_LEVEL} < 500800 - ${INSTALL_SCRIPT} ${WRKDIR}/munin-node-revive.sh ${PREFIX}/bin/munin-node-revive -.endif - ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${PREFIX}/etc/munin/munin-node.conf.sample - ${INSTALL_DATA} files/plugins.conf ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf.sample - @if [ ! -f ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf ]; then \ - ${INSTALL_DATA} ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf.sample ${PREFIX}/etc/munin/plugin-conf.d/plugins.conf; \ - fi - @${CAT} ${PKGMESSAGE} - @${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-node.conf.5 ${PREFIX}/man/man5 - @${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-node-configure.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-node.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-run.8 ${PREFIX}/man/man8 - @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL - @${ECHO} ${DISTNAME} | ${SED} -e 's/munin_//' > ${PREFIX}/etc/munin/VERSION.node - -.include diff --git a/dists/freebsd/munin-node/distinfo b/dists/freebsd/munin-node/distinfo deleted file mode 100644 index adf9dc7da3..0000000000 --- a/dists/freebsd/munin-node/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (munin_1.2.2.tar.gz) = e55ff3cc8d506558f32598f639952cca -SIZE (munin_1.2.2.tar.gz) = 325356 diff --git a/dists/freebsd/munin-node/files/munin-node-revive.sh.in b/dists/freebsd/munin-node/files/munin-node-revive.sh.in deleted file mode 100644 index 66bfa746a7..0000000000 --- a/dists/freebsd/munin-node/files/munin-node-revive.sh.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# -# Add the following lines to /etc/rc.conf to enable munin-node: -# munin_node_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable munin-node -# munin_node_config (path): Set to "%%PREFIX%%/etc/munin/munin-node.conf" by default. -# - -. %%RC_SUBR%% - -name="munin_node" -rcvar=`set_rcvar` - -[ -z "$munin_node_enable" ] && munin_node_enable="NO" -[ -z "$munin_node_config" ] && munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf" - -command="%%PREFIX%%/sbin/munin-node" -pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config` - -load_rc_config $name - -#set -x -pid=`check_pidfile $pidfile %%PREFIX%%/sbin/munin-node` -if [ -z "$pid" ]; then - run_rc_command start > /dev/null -fi diff --git a/dists/freebsd/munin-node/files/munin-node.sh.in b/dists/freebsd/munin-node/files/munin-node.sh.in deleted file mode 100644 index b770f4a984..0000000000 --- a/dists/freebsd/munin-node/files/munin-node.sh.in +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# - -# PROVIDE: munin-node -# REQUIRE: DAEMON -# BEFORE: cron -# KEYWORD: FreeBSD - -# -# Add the following lines to /etc/rc.conf to enable munin-node: -# munin_node_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable munin-node -# munin_node_config (path): Set to "%%PREFIX%%/etc/munin/munin-node.conf" by default. -# - -. %%RC_SUBR%% - -name="munin_node" -rcvar=`set_rcvar` - -[ -z "$munin_node_enable" ] && munin_node_enable="NO" -[ -z "$munin_node_config" ] && munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf" - -command="%%PREFIX%%/sbin/munin-node" -pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config` - -load_rc_config $name -run_rc_command "$1" diff --git a/dists/freebsd/munin-node/files/munin_node.sh b/dists/freebsd/munin-node/files/munin_node.sh deleted file mode 100644 index 1a174ec64c..0000000000 --- a/dists/freebsd/munin-node/files/munin_node.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# - -# PROVIDE: munin-node -# REQUIRE: DAEMON -# BEFORE: cron -# KEYWORD: FreeBSD - -# -# Add the following lines to /etc/rc.conf to enable munin-node: -# munin_node_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable munin-node -# munin_node_config (path): Set to "%PREFIX%/etc/munin/munin-node.conf" by default. -# - -. /etc/rc.subr - -name="munin_node" -rcvar=`set_rcvar` - -[ -z "$munin_node_enable" ] && munin_node_enable="NO" -[ -z "$munin_node_config" ] && munin_node_config="/usr/local/etc/munin/munin-node.conf" - -command="/usr/local/sbin/munin-node" -pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config` - -load_rc_config $name -run_rc_command "$1" diff --git a/dists/freebsd/munin-node/files/patch-Makefile b/dists/freebsd/munin-node/files/patch-Makefile deleted file mode 100644 index 8286b4d2cb..0000000000 --- a/dists/freebsd/munin-node/files/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- munin-1.0.0pre2.orig/Makefile Sat Jan 31 19:45:19 2004 -+++ munin-1.0.0pre2/Makefile Sun Feb 1 14:22:46 2004 -@@ -150,6 +150,7 @@ - build-man: build-man-stamp - - build-man-stamp: -+ mkdir -p build/doc - pod2man --section=8 --release=$(RELEASE) --center="Munin Documentation" \ - node/munin-node.in > build/doc/munin-node.8 - pod2man --section=8 --release=$(RELEASE) --center="Munin Documentation" \ diff --git a/dists/freebsd/munin-node/files/patch-Makefile.config b/dists/freebsd/munin-node/files/patch-Makefile.config deleted file mode 100644 index 5a32ac96d8..0000000000 --- a/dists/freebsd/munin-node/files/patch-Makefile.config +++ /dev/null @@ -1,86 +0,0 @@ ---- munin-1.1.7.orig/Makefile.config Tue Nov 23 19:52:38 2004 -+++ munin-1.1.7/Makefile.config Sun Nov 28 13:28:12 2004 -@@ -7,52 +7,56 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+ifdef PREFIX -+UPREFIX=$(PREFIX) -+else -+UPREFIX=/usr -+endif - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR = $(PREFIX)/etc/munin - - # Server only - where to put munin-cron --BINDIR = $(PREFIX)/bin -+BINDIR = $(UPREFIX)/bin - - # Client only - where to put munin-node, munin-node-configure, and munin-run --SBINDIR = $(PREFIX)/sbin -+SBINDIR = $(UPREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(UPREFIX)/doc - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(UPREFIX)/man - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(DATADIR) - - # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www --CGIDIR = $(HTMLDIR)/cgi -+HTMLDIR = $(PREFIX)/www/data/munin -+CGIDIR = $(PREFIX)/www/cgi-bin - - # Client only - Where to put RRD files and other intenal data --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = $(PREFIX)/var/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 -+LOGDIR = /var/log - - # Location of PID files and other statefiles. On the server, must be - # writable by the user "munin". --STATEDIR = $(DESTDIR)/var/run/munin -+STATEDIR = /var/run/munin - - # The perl interpreter to use --PERL = $(shell which perl) -+# Passed in from FreeBSD port Makefile. - - # The python interpreter to use (used by some plugins) --PYTHON = $(shell which python || echo /usr/bin/python) -+PYTHON = $(shell which python || echo /usr/local/bin/python) - - # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") -+PERLLIB = $(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") - - # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -69,9 +73,8 @@ - GROUP = munin - - # Which command to use to check if the USER and GROUP to run Munin as, exists. --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) -+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - CHOWN = chown - CHMOD = chmod diff --git a/dists/freebsd/munin-node/files/patch-cpu.in b/dists/freebsd/munin-node/files/patch-cpu.in deleted file mode 100644 index 4dbe91a6bf..0000000000 --- a/dists/freebsd/munin-node/files/patch-cpu.in +++ /dev/null @@ -1,15 +0,0 @@ ---- munin-1.0.4.orig/node/node.d.freebsd/cpu.in Sun May 9 21:18:35 2004 -+++ munin-1.0.4/node/node.d.freebsd/cpu.in Sat Nov 20 15:32:50 2004 -@@ -59,10 +59,10 @@ - OSV=`/sbin/sysctl -n kern.osrelease | cut -f1 -d.` - if [ "$OSV" = "4" ]; then - STATUNITS=`/sbin/sysctl -n kern.clockrate | cut -f16 -d' '` -- elif [ "$OSV" = "5" ]; then -+ elif [ "$OSV" -ge "5" ]; then - STATUNITS=`/sbin/sysctl -n kern.clockrate | cut -f13 -d' '` - fi --# PERCENT=`/sbin/sysctl -n hw.ncpu | awk '{print ($1)*100}'` -+ PERCENT=`/sbin/sysctl -n hw.ncpu | awk '{print ($1)*100}'` - SCALE=`echo 'scale=5;' $PERCENT/$STATUNITS | bc -q ` - NCPU=`/sbin/sysctl -n hw.ncpu` - if [ "$scaleto100" = yes ]; then diff --git a/dists/freebsd/munin-node/files/patch-munin-node.conf.in b/dists/freebsd/munin-node/files/patch-munin-node.conf.in deleted file mode 100644 index 535618ec79..0000000000 --- a/dists/freebsd/munin-node/files/patch-munin-node.conf.in +++ /dev/null @@ -1,11 +0,0 @@ ---- munin-1.0.0pre1.orig/node/munin-node.conf.in Thu Jan 15 15:28:57 2004 -+++ munin-1.0.0pre1/node/munin-node.conf.in Sun Jan 25 14:26:15 2004 -@@ -12,7 +12,7 @@ - # Which port to bind to; - host * - user root --group root -+group wheel - setsid yes - - # Regexps for files to ignore diff --git a/dists/freebsd/munin-node/files/patch-ping_.in b/dists/freebsd/munin-node/files/patch-ping_.in deleted file mode 100644 index 29c62c9a36..0000000000 --- a/dists/freebsd/munin-node/files/patch-ping_.in +++ /dev/null @@ -1,23 +0,0 @@ ---- munin-1.1.7.orig/node/node.d/ping_.in Tue Nov 16 21:10:19 2004 -+++ munin-1.1.7/node/node.d/ping_.in Sun Nov 28 11:30:36 2004 -@@ -22,9 +22,14 @@ - # Parameters: - # - # ping_args - Arguments to ping (default "-c 2") -+# ping_args2 - Arguments after the host name (required for Solaris) - # ping - Ping program to use - # host - Host to ping - # -+# Arguments for Solaris: -+# ping_args -s -+# ping_args2 56 2 -+# - #%# family=manual - - file_host=`basename $0 | sed 's/^ping_//g'` -@@ -45,4 +50,4 @@ - fi - - --${ping:-ping} ${ping_args:--c 2} ${host:-${file_host:-www.google.com}} | awk '/min\/avg\/max/ { split ($0, arr, "/"); print "ping.value " (arr[4]/1000)} /% packet loss/ {split ($7, arr2, "%"); print "packetloss.value " arr2[1]}' -+${ping:-ping} ${ping_args:--c 2} ${host:-${file_host:-www.google.com}} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' diff --git a/dists/freebsd/munin-node/files/patch-sendmail_mailtraffic.in b/dists/freebsd/munin-node/files/patch-sendmail_mailtraffic.in deleted file mode 100644 index bfc0ec7180..0000000000 --- a/dists/freebsd/munin-node/files/patch-sendmail_mailtraffic.in +++ /dev/null @@ -1,11 +0,0 @@ ---- munin-1.1.7.orig/node/node.d/sendmail_mailtraffic.in Sun Nov 21 21:27:53 2004 -+++ munin-1.1.7/node/node.d/sendmail_mailtraffic.in Sun Nov 28 10:50:45 2004 -@@ -26,7 +26,7 @@ - TEMP_FILE=/tmp/munin-sendmail.$$ - - if [ "$1" = "autoconf" ]; then -- if [ -f ${TEMP_FILE} ] ; then -+ if which mailstats 2>&1 > /dev/null ; then - echo yes - exit 0 - else diff --git a/dists/freebsd/munin-node/files/patch-vmstat.in b/dists/freebsd/munin-node/files/patch-vmstat.in deleted file mode 100644 index f8a6371882..0000000000 --- a/dists/freebsd/munin-node/files/patch-vmstat.in +++ /dev/null @@ -1,29 +0,0 @@ ---- munin-1.1.4.orig/node/node.d.freebsd/vmstat.in 2004-05-20 21:02:36.000000000 +0200 -+++ munin-1.1.4/node/node.d.freebsd/vmstat.in 2004-11-21 14:30:18.000000000 +0100 -@@ -35,7 +35,7 @@ - OSV=`/sbin/sysctl -n kern.osrelease | cut -f1 -d.` - - if [ "$1" = "autoconf" ]; then -- if [ "$OSV" = "5" ]; then -+ if [ "$OSV" -ge "5" ]; then - /sbin/sysctl -n vm.vmtotal 2>/dev/null >/dev/null - RESULT=$? - NAME=/sbin/sysctl -@@ -63,7 +63,7 @@ - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel process states' - echo 'graph_category processes' -- if [ "$OSV" = "5" ]; then -+ if [ "$OSV" -ge "5" ]; then - echo 'running.label running' - echo 'running.type GAUGE' - echo 'diskwait.label diskwait' -@@ -81,7 +81,7 @@ - exit 0 - fi - --if [ "$OSV" = "5" ]; then -+if [ "$OSV" -ge "5" ]; then - sysctl -n vm.vmtotal | awk ' - /^Processes:/ { - print "running.value", $3; diff --git a/dists/freebsd/munin-node/files/pkg-message.4 b/dists/freebsd/munin-node/files/pkg-message.4 deleted file mode 100644 index 206a440575..0000000000 --- a/dists/freebsd/munin-node/files/pkg-message.4 +++ /dev/null @@ -1,12 +0,0 @@ - -******************************************************************** -Unless this file already existed, a sample configuration file -has been placed in %%PREFIX%%/etc/munin/munin-node.conf. - -Please edit it according to your needs. - -The Munin client will be started at system boot automatically. -You can start it manually with: - %%PREFIX%%/etc/rc.d/munin-node.sh start -******************************************************************** - diff --git a/dists/freebsd/munin-node/files/pkg-message.in b/dists/freebsd/munin-node/files/pkg-message.in deleted file mode 100644 index 965c716ba8..0000000000 --- a/dists/freebsd/munin-node/files/pkg-message.in +++ /dev/null @@ -1,21 +0,0 @@ - -******************************************************************** -Unless this file already existed, a sample configuration file -has been placed in %%PREFIX%%/etc/munin/munin-node.conf. - -Please edit it according to your needs. - -******************************************************************** - -The Munin client will *not* be started automatically. To allow it -to start, put this line in /etc/rc.conf: - -munin_node_enable="YES" - -Then, it will be started on the next boot. If this line is already -present, the client will be started now. Otherwise, edit -/etc/rc.conf and execute this command: - - %%PREFIX%%/etc/rc.d/munin-node.sh start -******************************************************************** - diff --git a/dists/freebsd/munin-node/files/plugins.conf b/dists/freebsd/munin-node/files/plugins.conf deleted file mode 100644 index db6f908d12..0000000000 --- a/dists/freebsd/munin-node/files/plugins.conf +++ /dev/null @@ -1,37 +0,0 @@ -# This file is used to configure how the plugins are invoked. -# Place in /etc/munin/plugin-conf.d/ or corresponding directory. -# -# PLEASE NOTE: Changes in the plugin-conf.d directory are only -# read at munin-node startup, so restart at any changes. -# -# -# user # Set the user to run the plugin as -# group # Set the group to run the plugin as -# command # Run instead of the plugin. %c -# expands to what would normally be run. -# env. # Sets in the plugin's environment, see the -# individual plugins to find out which variables they -# care about. -# - -[mysql*] -#env.mysqlopts -u someuser - -[exim*] -group mail - -[cps*] -user root - -[apt] -user root - -[vlan*] -user root - -[postfix*] -user root -env.logfile maillog - -[sendmail*] -env.mspqueue /var/spool/clientmqueue diff --git a/dists/freebsd/munin-node/pkg-deinstall b/dists/freebsd/munin-node/pkg-deinstall deleted file mode 100644 index 0a0b43b809..0000000000 --- a/dists/freebsd/munin-node/pkg-deinstall +++ /dev/null @@ -1,85 +0,0 @@ -#! /bin/sh - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -stop_process() { - if [ -x $STARTSTOP ]; then - $STARTSTOP stop - fi -} - -delete_group() { - local g - - g=$1 - if yesno "Do you want me to remove group \"${g}\"" y; then - pw groupdel -n ${g} - echo "Done." - fi -} - -delnewsyslog() { - tmp="/etc/#munin-node$$" - sed -e '/^\/var\/log\/munin-node.log[ ]/d' /etc/newsyslog.conf >${tmp} - cat ${tmp} > /etc/newsyslog.conf - rm ${tmp} -} - -newsyslog() { - ENTRY=`grep /var/log/munin-node.log /etc/newsyslog.conf` - DEFAULT='/var/log/munin-node.log 644 7 * @T00 Z /var/run/munin/munin-node.pid' - if [ -z "$ENTRY" ]; then - exit 0 - elif [ "$ENTRY" = "$DEFAULT" ]; then - delnewsyslog - elif yesno "You have changed the default munin-node entry in \"/etc/newsyslog.conf\". -Do you want me to delete it?" y; then - delnewsyslog - echo "Done." - fi -} - - -OSVERSION=`/sbin/sysctl -n kern.osreldate` -if [ $OSVERSION -lt 500000 ]; then - STARTSTOP=${PKG_PREFIX}/etc/rc.d/munin-node.sh -else - STARTSTOP=/etc/rc.d/munin_node -fi - -case $2 in - DEINSTALL) - stop_process - newsyslog - ;; - POST-DEINSTALL) - delete_group munin - ;; -esac diff --git a/dists/freebsd/munin-node/pkg-descr b/dists/freebsd/munin-node/pkg-descr deleted file mode 100644 index 7acf4a0203..0000000000 --- a/dists/freebsd/munin-node/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Munin network-wide graphing framework (node) - -Munin is a tool for graphing all sorts of information about one or more -servers and displaying it in a web interface. It uses the excellent -RRDTool (written by Tobi Oetiker) and is written in Perl. Munin has a -master/node architecture. The master connects to all the nodes at regular -intervals, and asks them for data. It then stores the data in RRD-files, -and (if needed) updates the graphs. One of the main goals have been ease -of creating own "plugins" (graphs). - -This is the node part. It is used on all machines Munin shall watch. - -WWW: http://munin-monitoring.org diff --git a/dists/freebsd/munin-node/pkg-install b/dists/freebsd/munin-node/pkg-install deleted file mode 100644 index ceccf71189..0000000000 --- a/dists/freebsd/munin-node/pkg-install +++ /dev/null @@ -1,91 +0,0 @@ -#! /bin/sh - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -make_group() { - local g - - g=$1 - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd ${g} || exit - echo "Done." - else - echo "Please create it, and try again." - if ! grep -q "^${u}:" /etc/passwd; then - echo "While you're at it, please create a user \"${u}\" too," - echo "with a default group of \"${g}\"." - fi - exit 1 - fi - fi -} - -init_plugins() { - if [ -f ${PKG_PREFIX}/etc/munin/VERSION.node ]; then - prevver=$(cat ${PKG_PREFIX}/etc/munin/VERSION.node) - fi - - if [ -n "$prevver" ]; then - echo -n "Initializing new plugins.." - ${PKG_PREFIX}/sbin/munin-node-configure --shell --newer "${prevver%-*}" | sh -x - else - echo -n "Initializing plugins.." - ${PKG_PREFIX}/sbin/munin-node-configure --shell | sh -x - fi - echo "done." -} - -newsyslog() { - if grep -q /var/log/munin-node.log /etc/newsyslog.conf; then - : - else - cat >> /etc/newsyslog.conf </dev/null || true -@comment etc/munin/VERSION.node must remain for upgrade version check -@unexec if cmp -s %D/etc/munin/munin-node.conf %D/etc/munin/munin-node.conf.sample; then rm -f %D/etc/munin/munin-node.conf; fi -etc/munin/munin-node.conf.sample -@unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi -etc/munin/plugin-conf.d/plugins.conf.sample -@unexec rm %D/etc/rc.d/munin-node.sh 2>/dev/null || true -sbin/munin-node -sbin/munin-node-configure -sbin/munin-node-configure-snmp -sbin/munin-run -%%DATADIR%%/plugins/acpi -%%DATADIR%%/plugins/amavis -%%DATADIR%%/plugins/apache_accesses -%%DATADIR%%/plugins/apache_processes -%%DATADIR%%/plugins/apache_volume -%%DATADIR%%/plugins/apc_envunit_ -%%DATADIR%%/plugins/apc_nis -%%DATADIR%%/plugins/bind9 -%%DATADIR%%/plugins/bind9_rndc -%%DATADIR%%/plugins/courier_ -%%DATADIR%%/plugins/courier_mta_mailqueue -%%DATADIR%%/plugins/courier_mta_mailstats -%%DATADIR%%/plugins/courier_mta_mailvolume -%%DATADIR%%/plugins/cpu -%%DATADIR%%/plugins/cupsys_pages -%%DATADIR%%/plugins/df -%%DATADIR%%/plugins/df_inode -%%DATADIR%%/plugins/dhcpd3 -%%DATADIR%%/plugins/exim_mailqueue -%%DATADIR%%/plugins/exim_mailqueue_alt -%%DATADIR%%/plugins/exim_mailstats -%%DATADIR%%/plugins/foldingathome -%%DATADIR%%/plugins/foldingathome_rank -%%DATADIR%%/plugins/foldingathome_wu -%%DATADIR%%/plugins/hddtemp -%%DATADIR%%/plugins/hddtemp2 -%%DATADIR%%/plugins/hddtemp_smartctl -%%DATADIR%%/plugins/hddtempd -%%DATADIR%%/plugins/if_ -%%DATADIR%%/plugins/if_errcoll_ -%%DATADIR%%/plugins/ipac-ng -%%DATADIR%%/plugins/ircu -%%DATADIR%%/plugins/load -%%DATADIR%%/plugins/loggrep -%%DATADIR%%/plugins/mailman -%%DATADIR%%/plugins/mailscanner -%%DATADIR%%/plugins/mbmon_ -%%DATADIR%%/plugins/memory -%%DATADIR%%/plugins/mhttping -%%DATADIR%%/plugins/multips -%%DATADIR%%/plugins/munin_graph -%%DATADIR%%/plugins/munin_update -%%DATADIR%%/plugins/mysql_bytes -%%DATADIR%%/plugins/mysql_isam_space_ -%%DATADIR%%/plugins/mysql_queries -%%DATADIR%%/plugins/mysql_slowqueries -%%DATADIR%%/plugins/mysql_threads -%%DATADIR%%/plugins/named -%%DATADIR%%/plugins/netstat -%%DATADIR%%/plugins/ntp_ -%%DATADIR%%/plugins/ntp_states -%%DATADIR%%/plugins/nut_misc -%%DATADIR%%/plugins/nut_volts -%%DATADIR%%/plugins/open_files -%%DATADIR%%/plugins/perdition -%%DATADIR%%/plugins/ping_ -%%DATADIR%%/plugins/plugins.history -%%DATADIR%%/plugins/pm3users_ -%%DATADIR%%/plugins/pop_stats -%%DATADIR%%/plugins/postfix_mailqueue -%%DATADIR%%/plugins/postfix_mailstats -%%DATADIR%%/plugins/postfix_mailvolume -%%DATADIR%%/plugins/processes -%%DATADIR%%/plugins/ps_ -%%DATADIR%%/plugins/psu_ -%%DATADIR%%/plugins/samba -%%DATADIR%%/plugins/sendmail_mailqueue -%%DATADIR%%/plugins/sendmail_mailstats -%%DATADIR%%/plugins/sendmail_mailtraffic -%%DATADIR%%/plugins/smart_ -%%DATADIR%%/plugins/snmp__df -%%DATADIR%%/plugins/snmp__fc_if_ -%%DATADIR%%/plugins/snmp__fc_if_err_ -%%DATADIR%%/plugins/snmp__if_ -%%DATADIR%%/plugins/snmp__if_err_ -%%DATADIR%%/plugins/snmp__load -%%DATADIR%%/plugins/snmp__processes -%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan -%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp -%%DATADIR%%/plugins/snmp__sensors_fsc_fan -%%DATADIR%%/plugins/snmp__sensors_fsc_temp -%%DATADIR%%/plugins/snmp__sensors_mbm_fan -%%DATADIR%%/plugins/snmp__sensors_mbm_temp -%%DATADIR%%/plugins/snmp__sensors_mbm_volt -%%DATADIR%%/plugins/snmp__users -%%DATADIR%%/plugins/spamstats -%%DATADIR%%/plugins/squid_cache -%%DATADIR%%/plugins/squid_icp -%%DATADIR%%/plugins/squid_requests -%%DATADIR%%/plugins/squid_traffic -%%DATADIR%%/plugins/surfboard -%%DATADIR%%/plugins/swap -%%DATADIR%%/plugins/sybase_space -%%DATADIR%%/plugins/vmstat -@unexec rm -f /var/run/munin/munin-node.pid -@unexec rmdir /var/run/munin 2>/dev/null || true -@unexec rmdir %D/var/munin/plugin-state 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/plugins 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/etc/munin/plugin-conf.d 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin 2>/dev/null || true -@unexec echo -@unexec echo '********************************************************************' -@unexec echo "If you want to *completely* remove munin-node, you have to" -@unexec echo -@unexec echo " rm -rf %D/etc/munin/VERSION.node %D/etc/munin/plugins \\" -@unexec if [ -d %D/var/munin/plugin-state ]; then echo " %D/var/munin/plugin-state \\"; fi -@unexec if [ -f %D/etc/munin/munin-node.conf ]; then echo " %D/etc/munin/munin-node.conf \\"; fi -@unexec if [ -d %D/var/munin/plugin-state ]; then echo " %D/var/munin/plugin-state \\"; fi -@unexec if [ -d %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin ]; then echo " %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin \\"; fi -@unexec if [ -d %%LOCALBASE%%/%%SITE_PERL%%/Munin ]; then echo " %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin \\"; fi -@unexec echo " /var/log/munin-node.log*" -@unexec echo -@unexec echo "If you have already deinstalled munin-main, you can also" -@unexec echo -@unexec echo " rmdir %D/etc/munin %D/var/munin" -@unexec echo -@unexec echo "These files and directories have to be left on the system because" -@unexec echo "you may be performing an update. This process can't tell." -@unexec echo '********************************************************************' -@unexec echo diff --git a/dists/redhat/README b/dists/redhat/README deleted file mode 100644 index a9d52e8cda..0000000000 --- a/dists/redhat/README +++ /dev/null @@ -1,4 +0,0 @@ -Redhat specifics are hosted directly on pkgs.fedoraproject.org. - -www: http://pkgs.fedoraproject.org/cgit/munin.git -git: git://pkgs.fedoraproject.org/munin.git diff --git a/dists/sunos/Makefile b/dists/sunos/Makefile deleted file mode 100644 index d27d5a0c3e..0000000000 --- a/dists/sunos/Makefile +++ /dev/null @@ -1,133 +0,0 @@ - -BASE = / -VENDOR = munin-monitoring.org - -PKGNAME = munin - -PREFIX = $(BASE)/$(PKGNAME) -SUBST = $(PREFIX) - -VERSION = $(shell cat ../../RELEASE) -DIST = ../../../$(PKGNAME)_$(VERSION).tar.gz -#BUILD = $(PKGNAME)-$(VERSION) -BUILD = ../../ -OSTYPE = $(shell uname -p) - -PATH := "/opt/SUNWspro/bin/:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin/" - -DESTDIR := dists/sunos/install/dist/ - -all: $(PKGNAME)-$(VERSION)-$(OSTYPE).pkg $(PKGNAME)-node-$(VERSION)-$(OSTYPE).pkg - -clean: - rm -rf pkginfo build-stamp install install-stamp main node configure-stamp - cd $(BUILD); make clean - -#$(BUILD)/configure: $(DIST) -# gunzip -c $(DIST) | (tar -xf - && touch $(BUILD)/configure) - -#configure-stamp: $(BUILD)/configure -# touch configure-stamp - -#build-stamp: $(BUILD)/configure -# cd $(BUILD) ;\ -# PATH=$(PATH) make build build-doc build-man && touch build-stamp - -build-stamp: - cd $(BUILD) ;\ - PATH=$(PATH) make build build-doc build-man && touch dists/sunos/build-stamp - -install-stamp: build-stamp - mkdir -p install/dist/node install/dist/main - cd $(BUILD) ;\ - make prefix="" DESTDIR=$(DESTDIR)/node/ CHECKUSER="echo Skipping user check" CHECKGROUP="echo Skipping group check" CHOWN=/bin/true CHGRP=/bin/true install-node install-node-plugins - -cd $(BUILD) ;\ - make prefix="" DESTDIR=$(DESTDIR)/node CHECKUSER="echo Skipping user check" CHECKGROUP="echo Skipping group check" CHOWN=/bin/true CHGRP=/bin/true install-doc install-man - cd $(BUILD) ;\ - make prefix="" DESTDIR=$(DESTDIR)/main CHECKUSER="echo Skipping user check" CHECKGROUP="echo Skipping group check" CHOWN=/bin/true CHGRP=/bin/true install-main - -cd $(BUILD) ;\ - make prefix="" DESTDIR=$(DESTDIR)/main CHECKUSER="echo Skipping user check" CHECKGROUP="echo Skipping group check" CHOWN=/bin/true CHGRP=/bin/true install-doc install-man - touch install-stamp - -pkginfo: $(DIST) main/pkginfo node/pkginfo - echo "Generated pkginfo files." - -node/pkginfo: $(DIST) - -mkdir node - for f in pkginfo depend compver space request checkinstall \ - preinstall postinstall preremove postremove; do \ - test -r $(PWD)/$$f.node && cp $(PWD)/$$f.node $(PWD)/node/$$f; \ - done ;\ - (echo "# Generated file, do not edit"; \ - echo "PKG=$(PKGNAME)-node"; \ - echo "NAME=$(PKGNAME)-node"; \ - echo "OSTYPE=$(OSTYPE)"; \ - echo "VERSION=$(VERSION)"; \ - echo "CATEGORY=application"; \ - echo "VENDOR=$(VENDOR)"; \ - echo "EMAIL=jimmyo@users.sf.net"; \ - echo "PSTAMP="`getent passwd $(USER) | cut -d: -f5`; \ - echo "BASEDIR=$(BASE)"; \ - echo "CLASSES=none") > $@ - -main/pkginfo: $(DIST) - -mkdir main - for f in pkginfo depend compver space request checkinstall \ - preinstall postinstall preremove postremove; do \ - test -r $(PWD)/$$f.main && cp $(PWD)/$$f.main $(PWD)/main/$$f; \ - done ;\ - (echo "# Generated file, do not edit"; \ - echo "PKG=$(PKGNAME)"; \ - echo "NAME=$(PKGNAME)"; \ - echo "OSTYPE=$(OSTYPE)"; \ - echo "VERSION=$(VERSION)"; \ - echo "CATEGORY=application"; \ - echo "VENDOR=$(VENDOR)"; \ - echo "EMAIL=jimmyo@users.sf.net"; \ - echo "PSTAMP="`getent passwd $(USER) | cut -d: -f5`; \ - echo "BASEDIR=$(BASE)"; \ - echo "CLASSES=none") > $@ - -install/prototype: install-stamp install/node-prototype install/main-prototype - echo "Prototypes generated." - -install/node-prototype: install-stamp - for f in pkginfo depend compver space request checkinstall \ - preinstall postinstall preremove postremove; do \ - test -r $(PWD)/node/$$f && echo "i $$f=$(PWD)/node/$$f" || true; done \ - > install/node-prototype - cd install; pkgproto ../install/dist/node= \ - | awk ' { $$5="root"; $$6="sys"; } \ - { print; }' |\ - sed \ - -e 's|var/opt/munin 0755 root sys|var/opt/munin 0775 root munin|' \ - -e 's|var/log/munin 0755 root sys|var/log/munin 0775 root munin|' \ - -e 's|var/run/munin 0755 root sys|var/run/munin 0775 root munin|' \ - >> ../install/node-prototype - -install/main-prototype: install-stamp - for f in pkginfo depend compver space request checkinstall \ - preinstall postinstall preremove postremove; do \ - test -r $(PWD)/main/$$f && echo "i $$f=$(PWD)/main/$$f" || true; done \ - > install/main-prototype - cd install; pkgproto ../install/dist/main= \ - | awk ' { $$5="root"; $$6="sys"; } \ - { print; }' |\ - sed \ - -e 's|var/opt/munin 0755 root sys$$|var/opt/munin 0775 munin munin|' \ - -e 's|var/log/munin 0755 root sys$$|var/log/munin 0775 munin munin|' \ - -e 's|var/run/munin 0755 root sys$$|var/run/munin 0775 munin munin|' >> ../install/main-prototype - -install/$(PKGNAME): pkginfo install/main-prototype - cd install; rm prototype || true; ln -s main-prototype prototype; pkgmk -d . - -install/$(PKGNAME)-node: pkginfo install/node-prototype - cd install; rm prototype || true; ln -s node-prototype prototype; pkgmk -d . - -$(PKGNAME)-$(VERSION)-$(OSTYPE).pkg: install/$(PKGNAME) - pkgtrans `pwd`/install $@ $(PKGNAME) - mv install/$(PKGNAME)-$(VERSION)-$(OSTYPE).pkg . - -$(PKGNAME)-node-$(VERSION)-$(OSTYPE).pkg: install/$(PKGNAME)-node - pkgtrans `pwd`/install $@ $(PKGNAME)-node - mv install/$(PKGNAME)-node-$(VERSION)-$(OSTYPE).pkg . diff --git a/dists/sunos/README b/dists/sunos/README deleted file mode 100644 index 90c6154d72..0000000000 --- a/dists/sunos/README +++ /dev/null @@ -1 +0,0 @@ -See also resources/solaris-smf/ for SMF manifest and startup script diff --git a/dists/sunos/postinstall.node b/dists/sunos/postinstall.node deleted file mode 100644 index 508ef7178d..0000000000 --- a/dists/sunos/postinstall.node +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/opt/munin/sbin/munin-node-configure --shell | /bin/sh diff --git a/dists/sunos/preinstall.main b/dists/sunos/preinstall.main deleted file mode 100644 index e87c0efe79..0000000000 --- a/dists/sunos/preinstall.main +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -groupadd munin 2>/dev/null || true -useradd -g munin munin 2>/dev/null || true diff --git a/dists/sunos/preinstall.node b/dists/sunos/preinstall.node deleted file mode 100644 index b1255e7dc1..0000000000 --- a/dists/sunos/preinstall.node +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -groupadd munin 2>/dev/null || true diff --git a/dists/suse/Makefile.config b/dists/suse/Makefile.config deleted file mode 100644 index 1b29598ee7..0000000000 --- a/dists/suse/Makefile.config +++ /dev/null @@ -1,20 +0,0 @@ -# Modifications from ../../Makefile.config - -PREFIX = $(DESTDIR)/usr -CONFDIR = $(DESTDIR)/etc/munin -LIBDIR = $(PREFIX)/share/munin -SBINDIR = $(PREFIX)/sbin -BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/share/man -HTMLDIR = $(DESTDIR)/var/www/html/munin -DBDIR = $(DESTDIR)/var/lib/munin -LOGDIR = $(DESTDIR)/var/log/munin -STATEDIR = $(DESTDIR)/var/run/munin -PERLLIB = $(DESTDIR)$(shell ( $(PERL) -V:vendorlib | egrep -v "UNKNOWN|=''" || $(PERL) -V:sitelib) | cut -d\' -f 2) - -# Handled in the munin.spec -CHECKUSER:= true -CHECKGROUP:= true -CHOWN := echo Not done: chown -CHMOD := echo Not done: chmod -CHGRP := echo Not done: chgrp diff --git a/dists/suse/munin-node.cron.d b/dists/suse/munin-node.cron.d deleted file mode 100644 index 2eb8707a4a..0000000000 --- a/dists/suse/munin-node.cron.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# cron-jobs for -# - -MAILTO=root - diff --git a/dists/suse/munin-node.rc b/dists/suse/munin-node.rc deleted file mode 100755 index ef32a84bfd..0000000000 --- a/dists/suse/munin-node.rc +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/sh -# -# munin-node Control the Munin Node Server (formerly Linpro RRD client) -# -# Author: Rune Nordbøe Skillingstad -# -### BEGIN INIT INFO -# Provides: munin-node -# Required-Start: $network -# Required-Stop: -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Description: Munin Node Agents -### END INIT INFO - -# Source SuSE config -. /etc/rc.status - -MUNIN_BIN=/usr/sbin/munin-node -test -x $MUNIN_BIN || exit 5 - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status - -# First reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - misc error -# 2 - invalid or excess args -# 3 - unimplemented feature (e.g. reload) -# 4 - insufficient privilege -# 5 - program not installed -# 6 - program not configured -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signalling is not supported) are -# considered a success. - -# See how we were called. -case "$1" in - start) - echo -n "Starting Munin Node: " - if [ ! -d /var/run/munin ]; then - mkdir -p /var/run/munin 2>/dev/null - chown munin /var/run/munin - fi - - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - startproc $MUNIN_BIN - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Stopping Munin Node agents: " - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -TERM $MUNIN_BIN - - # Remember status and be verbose - rc_status -v - ;; - restart|reload) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - status) - echo -n "Checking for Munin Node: " - checkproc $MUNIN_BIN - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status|restart}" - exit 1 -esac -rc_exit diff --git a/dists/suse/munin.cron.d b/dists/suse/munin.cron.d deleted file mode 100644 index 9f154080e3..0000000000 --- a/dists/suse/munin.cron.d +++ /dev/null @@ -1,7 +0,0 @@ -# -# cron-jobs for munin -# - -MAILTO=root - -*/5 * * * * munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron diff --git a/dists/suse/munin.spec.in b/dists/suse/munin.spec.in deleted file mode 100644 index 59d226c1f3..0000000000 --- a/dists/suse/munin.spec.in +++ /dev/null @@ -1,287 +0,0 @@ -Name: munin -Version: @@VERSION@@ -Release: 1 - -Summary: Network-wide graphing framework (grapher/gatherer) -License: GPL -Group: System Environment/Daemons -URL: http://munin.sourceforge.net -Packager: Rune Nordbøe Skillingstad -Vendor: Linpro AS -Distribution: Linpro AS SuSE Linux Software Archives -Source0: %{name}_%{version}.tar.gz -Source1: Makefile.config -Source2: munin-node.rc -Source3: munin.cron.d -Source4: munin.logrotate -Source5: munin-node.logrotate -Source6: munin-node.cron.d -Source7: plugins.conf -Patch0: patch-001 -Patch1: patch-002 -Requires: perl-HTML-Template -Requires: rrdtool -Obsoletes: lrrd-server -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%define confdir /etc/munin -%define libdir /usr/share/munin -%define htmldir /srv/www/htdocs/munin -%define cgidir /srv/www/cgi-bin -%define dbdir /var/lib/munin -%define logdir /var/log/munin -%define statedir /var/run/munin - -%description -Munin is a highly flexible and powerful solution used to create graphs of -virtually everything imaginable throughout your network, while still -maintaining a rattling ease of installation and configuration. - -This package contains the grapher/gatherer. You will only need one instance of -it in your network. It will periodically poll all the nodes in your network -it's aware of for data, which it in turn will use to create graphs and HTML -pages, suitable for viewing with your graphical web browser of choice. - -Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent -RRDtool. To see a real example of Munin in action, take a peek at -. - -%package node -Group: System Environment/Daemons -Summary: Network-wide graphing framework (node) -BuildArch: noarch -Requires: perl-Net-Server -Requires: ps -Requires: sysstat -Obsoletes: lrrd-client - -%description node -Munin is a highly flexible and powerful solution used to create graphs of -virtually everything imaginable throughout your network, while still -maintaining a rattling ease of installation and configuration. - -This package contains node software. You should install it on all the nodes -in your network. It will know how to extract all sorts of data from the -node it runs on, and will wait for the gatherer to request this data for -further processing. - -It includes a range of plugins capable of extracting common values such as -cpu usage, network usage, load average, and so on. Creating your own plugins -which are capable of extracting other system-specific values is very easy, -and is often done in a matter of minutes. You can also create plugins which -relay information from other devices in your network that can't run Munin, -such as a switch or a server running another operating system, by using -SNMP or similar technology. - -Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent -RRDtool. To see a real example of Munin in action, take a peek at -. - -%prep -%setup -q -%patch0 -%patch1 -p1 -mkdir -p %{buildroot} - -%build - -# htmldoc and html2text are not available for Red Hat. Quick hack with perl: -# Skip the PDFs. -perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile -perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile - -make clean -make CONFIG=%{SOURCE1} \ - DOCDIR=%{_docdir}/munin \ - MANDIR=%{_mandir} \ - HTMLDIR=%{htmldir} \ - CGIDIR=%{cgidir} \ - LIBDIR=%{libdir} \ - CONFDIR=%{confdir} \ - DESTDIR=%{buildroot} \ - DBDIR=%{dbdir} \ - SBINDIR=%{_sbindir} \ - LOGDIR=%{logdir} \ - STATEDIR=%{statedir} \ - build - -mkdir -p %{buildroot}%{dbdir}/plugin-state -mkdir -p %{buildroot}%{logdir} -mkdir -p %{buildroot}%{statedir} -mkdir -p %{buildroot}/etc/init.d -mkdir -p %{buildroot}/etc/cron.d -mkdir -p %{buildroot}/etc/logrotate.d -mkdir -p %{buildroot}%{htmldir} - -%install -make CONFIG=%{SOURCE1} \ - DOCDIR=%{buildroot}%{_docdir}/munin \ - MANDIR=%{buildroot}%{_mandir} \ - HTMLDIR=%{buildroot}%{htmldir} \ - LIBDIR=%{buildroot}%{libdir} \ - CGIDIR=%{buildroot}%{cgidir} \ - CONFDIR=%{buildroot}%{confdir} \ - DESTDIR=%{buildroot} \ - DBDIR=%{buildroot}%{dbdir} \ - SBINDIR=%{buildroot}%{_sbindir} \ - LOGDIR=%{buildroot}%{logdir} \ - STATEDIR=%{buildroot}%{statedir} \ - install-main install-node install-node-plugins install-doc install-man - -install -m0755 %{SOURCE2} %{buildroot}/etc/init.d/munin-node -install -m0644 %{SOURCE3} %{buildroot}/etc/cron.d/munin -install -m0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin -install -m0644 %{SOURCE5} %{buildroot}/etc/logrotate.d/munin-node -install -m0644 %{SOURCE6} %{buildroot}/etc/cron.d/munin-node -install -m0644 %{SOURCE7} %{buildroot}%{confdir}/plugin-conf.d/munin-node -install -m0644 ChangeLog %{buildroot}%{_docdir}/munin/ChangeLog - -%clean -[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} - - -## Server - -%pre - -getent group munin >/dev/null || groupadd -r munin -getent passwd munin > /dev/null || useradd -r -d %{dbdir} -g munin munin - -%post -mkdir -p %{htmldir} -mkdir -p %{logdir} -mkdir -p %{dbdir} -chown -R munin:munin %{htmldir} -chown -R munin:munin %{logdir} -chown -R munin:munin %{statedir} -chown -R munin:munin %{dbdir} - -## Node -%pre node -getent group munin >/dev/null || groupadd -r munin -getent passwd munin > /dev/null || useradd -r -d %{dbdir} -g munin munin - -%post node -if [ $1 = 1 ] -then - /sbin/chkconfig --add munin-node - /usr/sbin/munin-node-configure --shell | sh -fi -%{fillup_and_insserv -n -s -y munin munin-node START_MUNIN_NODE} -mkdir -p %{logdir} -mkdir -p %{dbdir}/plugin-state -chown -R munin:munin %{logdir} -chown -R munin:munin %{dbdir} -chmod g+w %{dbdir}/plugin-state -/etc/init.d/munin-node status >/dev/null 2>&1 || /etc/init.d/munin-node start - -%preun node -if [ $1 = 0 ] -then - /sbin/service munin-node stop > /dev/null 2>&1 - /sbin/chkconfig --del munin-node - rmdir %{logdir} 2>/dev/null || true -fi -%stop_on_removal munin-node - -%postun node -%restart_on_update munin-node -%{insserv_cleanup} - - -%files -%defattr(-, root, root) -%doc %{_docdir}/munin/README.api -%doc %{_docdir}/munin/README.plugins -%doc %{_docdir}/munin/COPYING -%doc %{_docdir}/munin/ChangeLog -%doc %{_mandir}/man8/munin-graph* -%doc %{_mandir}/man8/munin-update* -%doc %{_mandir}/man8/munin-html* -%doc %{_mandir}/man8/munin-cron* -%doc %{_mandir}/man5/munin.conf* -%doc %{_mandir}/man8/munin-limits.8.gz -%{_bindir}/munin-cron -%{_datadir}/munin/munin-graph -%{_datadir}/munin/munin-html -%{_datadir}/munin/munin-update -%{_libdir}/perl5/*perl/5.*/Munin.pm -%{_usr}/share/munin/munin-limits -%{cgidir}/munin-cgi-graph -%config %{confdir}/templates/* -%config /etc/cron.d/munin -%config(noreplace) %{confdir}/munin.conf -%config /etc/logrotate.d/munin -%dir %{statedir} - - -%files node -%defattr(-, root, root) -%doc %{_docdir}/munin/COPYING -%doc %{_docdir}/munin/munin-doc.html -%doc %{_docdir}/munin/munin-faq.html -%doc %{_mandir}/man8/munin-run* -%doc %{_mandir}/man8/munin-node* -%doc %{_mandir}/man5/munin-node* -%{_sbindir}/munin-run -%{_sbindir}/munin-node -%{_sbindir}/munin-node-configure -%{_sbindir}/munin-node-configure-snmp -%{_datadir}/munin/plugins/* -%config(noreplace) %{confdir}/munin-node.conf -%config(noreplace) %{confdir}/plugin-conf.d/munin-node -%config /etc/init.d/munin-node -%config /etc/cron.d/munin-node -%config /etc/logrotate.d/munin-node -%dir %{confdir}/plugins - -%changelog -* Mon Apr 3 2005 Rune Nordbøe Skillingstad -- 1.2.3 release -* Fri Apr 1 2005 Rune Nordbøe Skillingstad -- 1.2.2 release -- Fixed SF bug 1164481 (missing /srv/www/htdocs/munin) -- Fixed SF bug 1164477 (patch for Net::Domain on PPC64) -* Fri Mar 11 2005 Rune Nordbøe Skillingstad -- 1.2.1 release -* Wed Mar 9 2005 Rune Nordbøe Skillingstad -- Fixed erronumous path to web directory -- Added start of node if not running -* Thu Mar 8 2005 Rune Nordbøe Skillingstad -- Fixed some build path problems -* Thu Feb 24 2005 Rune Nordbøe Skillingstad -- New major release -* Wed Feb 9 2005 Rune Nordbøe Skillingstad -- Updated to version 1.2.0rc2. -- Removed Nagios stuff -- Added noreplace for some central configuration files -* Thu Nov 18 2004 Rune Nordbøe Skillingstad -- Updated to version 1.0.4 -* Mon Nov 08 2004 Rune Nordbøe Skillingstad -- Updated version 1.0.3 / sync with redhat-build -* Wed Aug 04 2004 Rune Nordbøe Skillingstad -- Initial SuSE build -* Sun Feb 01 2004 Ingvar Hagelund -- Sync with CVS. Version 1.0.0pre2 -* Sun Jan 18 2004 Ingvar Hagelund -- Sync with CVS. Change names to munin. -* Fri Oct 31 2003 Ingvar Hagelund -- Lot of small fixes. Now builds on more RPM distros -* Wed May 21 2003 Ingvar Hagelund -- Sync with CVS -- 0.9.5-1 -* Tue Apr 1 2003 Ingvar Hagelund -- Sync with CVS -- Makefile-based install of core files -- Build doc (only pod2man) -* Thu Jan 9 2003 Ingvar Hagelund -- Sync with CVS, auto rpmbuild -* Thu Jan 2 2003 Ingvar Hagelund -- Fix spec file for RedHat 8.0 and new version of lrrd -* Wed Sep 4 2002 Ingvar Hagelund -- Small bugfixes in the rpm package -* Tue Jun 18 2002 Kjetil Torgrim Homme -- new package - - diff --git a/dists/suse/patch-002 b/dists/suse/patch-002 deleted file mode 100644 index 3be60efd39..0000000000 --- a/dists/suse/patch-002 +++ /dev/null @@ -1,46 +0,0 @@ -diff -ruN munin-1.2.2/node/munin-node.in munin-1.2.2.patch/node/munin-node.in ---- munin-1.2.2/node/munin-node.in 2005-02-16 18:12:03.000000000 +0100 -+++ munin-1.2.2.patch/node/munin-node.in 2005-04-01 09:50:13.000000000 +0200 -@@ -289,13 +289,13 @@ - - sub get_fq_hostname { - my $hostname; -- eval { -- require Net::Domain; -- $hostname = Net::Domain::hostfqdn(); -- }; -- return $hostname if $hostname; -+# eval { -+# require Net::Domain; -+# $hostname = Net::Domain::hostfqdn(); -+# }; -+# return $hostname if $hostname; - -- $hostname = `hostname`; # Fall$ -+ $hostname = `hostname --fqdn`; # Fall$ - chomp($hostname); - $hostname =~ s/\s//g; - return $hostname; -diff -ruN munin-1.2.2/node/munin-run.in munin-1.2.2.patch/node/munin-run.in ---- munin-1.2.2/node/munin-run.in 2004-12-22 22:33:48.000000000 +0100 -+++ munin-1.2.2.patch/node/munin-run.in 2005-04-01 09:50:43.000000000 +0200 -@@ -445,13 +445,13 @@ - - sub get_fq_hostname { - my $hostname; -- eval { -- require Net::Domain; -- $hostname = Net::Domain::hostfqdn(); -- }; -- return $hostname if $hostname; -+# eval { -+# require Net::Domain; -+# $hostname = Net::Domain::hostfqdn(); -+# }; -+# return $hostname if $hostname; - -- $hostname = `hostname`; # Fall$ -+ $hostname = `hostname --fqdn`; # Fall$ - chomp($hostname); - $hostname =~ s/\s//g; - return $hostname; diff --git a/dists/tarball/plugins.conf b/dists/tarball/plugins.conf deleted file mode 100644 index 990bbb2a44..0000000000 --- a/dists/tarball/plugins.conf +++ /dev/null @@ -1,33 +0,0 @@ -# This file is used to configure how the plugins are invoked. -# Place in /etc/munin/plugin-conf.d/ or corresponding directory. -# -# PLEASE NOTE: Changes in the plugin-conf.d directory are only -# read at munin-node startup, so restart at any changes. -# -# user # Set the user to run the plugin as -# group # Set the group to run the plugin as -# command # Run instead of the plugin. %c -# expands to what would normally be run. -# env. # Sets in the plugin's environment, see the -# individual plugins to find out which variables they -# care about. -# -# - -[mysql*] -#env.mysqlopts -u someuser - -[exim*] -group mail - -[cps*] -user root - -[apt] -user root - -[vlan*] -user root - -[postfix*] -user root