diff options
author | Jonathan Chapman <glitch@glitchwrks.com> | 2015-10-09 23:50:33 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-10-09 23:50:56 +0700 |
commit | d5c65817b72ac6a07fa3fd21bf47b8b2e6f1108c (patch) | |
tree | 3525ea6c558fdff3bec910dc1ea97de71ae85d1e /system/munin-node/patches | |
parent | 1673835d5a699ff9292dd33bef731a44466bfc2b (diff) |
system/munin-node: Added (Statistics gathering client for Munin).
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/munin-node/patches')
-rw-r--r-- | system/munin-node/patches/Makefile.config.patch | 72 | ||||
-rw-r--r-- | system/munin-node/patches/Makefile.patch | 19 |
2 files changed, 91 insertions, 0 deletions
diff --git a/system/munin-node/patches/Makefile.config.patch b/system/munin-node/patches/Makefile.config.patch new file mode 100644 index 000000000000..8617deeebb69 --- /dev/null +++ b/system/munin-node/patches/Makefile.config.patch @@ -0,0 +1,72 @@ +--- Makefile.config 2014-11-24 16:46:24.000000000 -0500 ++++ Makefile.config.new 2015-07-16 14:12:13.868927186 -0400 +@@ -17,10 +17,10 @@ + # + # the base of the Munin installation. + # +-PREFIX = $(DESTDIR)/opt/munin ++PREFIX = $(DESTDIR)/usr + + # Where Munin keeps its configurations (server.conf, client.conf, ++) +-CONFDIR = $(DESTDIR)/etc/opt/munin ++CONFDIR = $(DESTDIR)/etc/munin + + # Server only - where to put munin-cron + BINDIR = $(PREFIX)/bin +@@ -35,17 +35,17 @@ + MANDIR = $(PREFIX)/man + + # Where to put internal binaries and plugin repository +-LIBDIR = $(PREFIX)/lib ++LIBDIR = $(PREFIX)/lib/munin + + # Server only - Output directory + HTMLDIR = $(PREFIX)/www/docs + CGIDIR = $(PREFIX)/www/cgi + + # Where to put internal data for master (RRD, internal files, ...) +-DBDIR = $(DESTDIR)/var/opt/munin ++DBDIR = $(DESTDIR)/var/munin + + # Where to put internal data for node (plugin state, ...) +-DBDIRNODE = $(DESTDIR)/var/opt/munin-node ++DBDIRNODE = $(DESTDIR)/var/db/munin-node + + # Client only - Where the spool files are written. Must be writable by + # group "munin", and should be preserved between reboots +@@ -56,7 +56,7 @@ + PLUGSTATE = $(DBDIRNODE)/plugin-state + + # Where Munin should place its logs. +-LOGDIR = $(PREFIX)/log/munin ++LOGDIR = $(DESTDIR)/var/log/munin + + # Location of PID files and other statefiles. On the server, must be + # writable by the user "munin". +@@ -133,26 +133,6 @@ + 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")) + +-# For OSX, comment out the previous two lines and comment in these +-# +-#CHECKUSER := $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-#CHECKGROUP := $(shell nicl . -read /groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) +- +-# For OSX 10.5 (Leopard), use the following two lines instead of what's above +-# +-#CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) +- +- +-# For HP-UX, use these instead: +-# +-#CHECKUSER := $(shell pwget -n $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-#CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) +- +-# For Cygwin, use these instead: +-#CHECKUSER := $(shell id $(USER) >/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 + CHGRP := chgrp diff --git a/system/munin-node/patches/Makefile.patch b/system/munin-node/patches/Makefile.patch new file mode 100644 index 000000000000..345022b94141 --- /dev/null +++ b/system/munin-node/patches/Makefile.patch @@ -0,0 +1,19 @@ +--- /home/glitch/builds/munin-node/munin-2.0.25/Makefile 2014-11-24 16:46:24.000000000 -0500 ++++ Makefile 2015-07-16 14:32:54.688903959 -0400 +@@ -30,6 +30,7 @@ + MAN8 := master/_bin/munin-update master/_bin/munin-limits master/_bin/munin-html master/_bin/munin-graph + PODMAN8 := build/master/doc/munin-cron master/doc/munin master/doc/munin-check + PODMAN5 := build/master/doc/munin.conf node/doc/munin-node.conf ++MAN3EXT := $(shell $(PERL) -e 'use Config; print $$Config{man3ext};') + + .PHONY: install install-pre install-master-prime install-node-prime install-node-pre install-common-prime install-doc install-man \ + build build-common-prime build-common-pre build-doc \ +@@ -284,7 +285,7 @@ + -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \ + -e 's|\@\@BASH\@\@|$(BASH)|g;' \ + -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \ +- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \ ++ ./master/blib/libdoc/Munin::Master::HTMLOld.$(MAN3EXT) \ + ./master/blib/lib/Munin/Master/HTMLOld.pm \ + ./node/blib/sbin/munin-node-configure \ + ./node/blib/sbin/munin-node \ |