Attachment #86453 for bug #76018




#
# the base of the Munin installation.
# 
PREFIX     = $(DESTDIR)/usr

# Where Munin keeps its configurations (server.conf, client.conf, ++)
CONFDIR    = $(DESTDIR)/etc/munin

# Server only - where to put munin-cron
BINDIR     = $(PREFIX)/bin

SBINDIR    = $(PREFIX)/sbin

# Where to put text and html documentation
DOCDIR     = $(PREFIX)/share/doc

# Where to put man pages
MANDIR     = $(PREFIX)/share/man

# Where to put internal binaries and plugin repository
LIBDIR     = $(PREFIX)/lib

# Server only - Output directory
HTMLDIR    = $(PREFIX)/var/www/localhost/htdocs/munin
CGIDIR     = $(HTMLDIR)/cgi

# 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

PLUGINUSER = nobody

# Which command to use to check if the USER and GROUP to run Munin as, exists.
# Gentoo: Ignore, since user creating is taking place later
CHECKUSER:= true
CHECKGROUP:= true
CHOWN   := echo Not done: chown
CHMOD   := echo Not done: chmod
CHGRP   := echo Not done: chgrp





#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

# Copyright 2004 Andrei Mikhailovsky @ Arhont Ltd - Information Security http://www.arhont.com

depend() {
        need net
}

start() {
	ebegin "Starting munin-node"
	start-stop-daemon --quiet --start --pidfile /var/run/munin/munin-node.pid --exec /usr/sbin/munin-node
	eend $?
}

stop() {
	ebegin "Stopping munin-node"
	start-stop-daemon --quiet --stop --pidfile /var/run/munin/munin-node.pid
	eend $?
}


[postfix*]
user root

[hddtemp*]
user root

[vlan*]
user root

[fw_*]
user root

Return to bug 76018

Lines 7-16 Link Here

(-)Makefile.config.orig (-13 / +13 lines)
7	#	7	#
8	# the base of the Munin installation.	8	# the base of the Munin installation.
9	#	9	#
10	PREFIX = $(DESTDIR)/opt/munin	10	PREFIX = $(DESTDIR)/usr
11		11
12	# Where Munin keeps its configurations (server.conf, client.conf, ++)	12	# Where Munin keeps its configurations (server.conf, client.conf, ++)
13	CONFDIR = $(DESTDIR)/etc/opt/munin	13	CONFDIR = $(DESTDIR)/etc/munin
14		14
15	# Server only - where to put munin-cron	15	# Server only - where to put munin-cron
16	BINDIR = $(PREFIX)/bin	16	BINDIR = $(PREFIX)/bin
Lines 19-38 Link Here
19	SBINDIR = $(PREFIX)/sbin	19	SBINDIR = $(PREFIX)/sbin
20		20
21	# Where to put text and html documentation	21	# Where to put text and html documentation
22	DOCDIR = $(PREFIX)/doc	22	DOCDIR = $(PREFIX)/share/doc
23		23
24	# Where to put man pages	24	# Where to put man pages
25	MANDIR = $(PREFIX)/man	25	MANDIR = $(PREFIX)/share/man
26		26
27	# Where to put internal binaries and plugin repository	27	# Where to put internal binaries and plugin repository
28	LIBDIR = $(PREFIX)/lib	28	LIBDIR = $(PREFIX)/lib
29		29
30	# Server only - Output directory	30	# Server only - Output directory
31	HTMLDIR = $(PREFIX)/var/www	31	HTMLDIR = $(PREFIX)/var/www/localhost/htdocs/munin
32	CGIDIR = $(HTMLDIR)/cgi	32	CGIDIR = $(HTMLDIR)/cgi
33		33
34	# Client only - Where to put RRD files and other intenal data	34	# Client only - Where to put RRD files and other intenal data
35	DBDIR = $(DESTDIR)/var/opt/munin	35	DBDIR = $(DESTDIR)/var/lib/munin
36		36
37	# Client only - Where plugins should put their states. Must be writable by	37	# Client only - Where plugins should put their states. Must be writable by
38	# group "munin", and should be preserved between reboots	38	# group "munin", and should be preserved between reboots
Lines 72-81 Link Here
72	PLUGINUSER = nobody	72	PLUGINUSER = nobody
73		73
74	# Which command to use to check if the USER and GROUP to run Munin as, exists.	74	# Which command to use to check if the USER and GROUP to run Munin as, exists.
75	GETENT = $(shell which getent \|\| which true 2>/dev/null)	75	# Gentoo: Ignore, since user creating is taking place later
76	CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))	76	CHECKUSER:= true
77	CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))	77	CHECKGROUP:= true
78		78	CHOWN := echo Not done: chown
79	CHOWN = chown	79	CHMOD := echo Not done: chmod
80	CHMOD = chmod	80	CHGRP := echo Not done: chgrp
81	CHGRP = chgrp	81

Line 0 Link Here

(-)dists/tarball/munin-node (-1 / +31 lines)
0	-- dists/tarball/plugins.conf 2004-11-16 17:49:33.000000000 +0000	1	#!/sbin/runscript
		2	# Copyright 1999-2004 Gentoo Foundation
		3	# Distributed under the terms of the GNU General Public License v2
		4	# $Header: $
		5
		6	# Copyright 2004 Andrei Mikhailovsky @ Arhont Ltd - Information Security http://www.arhont.com
		7
		8	depend() {
		9	need net
		10	}
		11
		12	start() {
		13	ebegin "Starting munin-node"
		14	start-stop-daemon --quiet --start --pidfile /var/run/munin/munin-node.pid --exec /usr/sbin/munin-node
		15	eend $?
		16	}
		17
		18	stop() {
		19	ebegin "Stopping munin-node"
		20	start-stop-daemon --quiet --stop --pidfile /var/run/munin/munin-node.pid
		21	eend $?
		22	}
Lines 29-31 Link Here
29		29
30	[postfix*]	30	[postfix*]
31	user root	31	user root
		32
		33	[hddtemp*]
		34	user root
		35
		36	[vlan*]
		37	user root
		38
		39	[fw_*]
		40	user root