[arch-commits] Commit in munin/repos (17 files)

Antonio Rojas arojas at archlinux.org
Sat May 2 08:42:48 UTC 2020


    Date: Saturday, May 2, 2020 @ 08:42:47
  Author: arojas
Revision: 382131

archrelease: copy trunk to testing-any

Added:
  munin/repos/testing-any/
  munin/repos/testing-any/08-munin-font-dir.conf
    (from rev 382130, munin/trunk/08-munin-font-dir.conf)
  munin/repos/testing-any/Makefile.config
    (from rev 382130, munin/trunk/Makefile.config)
  munin/repos/testing-any/PKGBUILD
    (from rev 382130, munin/trunk/PKGBUILD)
  munin/repos/testing-any/logrotate.munin
    (from rev 382130, munin/trunk/logrotate.munin)
  munin/repos/testing-any/logrotate.munin-node
    (from rev 382130, munin/trunk/logrotate.munin-node)
  munin/repos/testing-any/munin-async.service
    (from rev 382130, munin/trunk/munin-async.service)
  munin/repos/testing-any/munin-cron-entry
    (from rev 382130, munin/trunk/munin-cron-entry)
  munin/repos/testing-any/munin-graph.service
    (from rev 382130, munin/trunk/munin-graph.service)
  munin/repos/testing-any/munin-graph.socket
    (from rev 382130, munin/trunk/munin-graph.socket)
  munin/repos/testing-any/munin-html.service
    (from rev 382130, munin/trunk/munin-html.service)
  munin/repos/testing-any/munin-html.socket
    (from rev 382130, munin/trunk/munin-html.socket)
  munin/repos/testing-any/munin-node.install
    (from rev 382130, munin/trunk/munin-node.install)
  munin/repos/testing-any/munin-node.service
    (from rev 382130, munin/trunk/munin-node.service)
  munin/repos/testing-any/munin.install
    (from rev 382130, munin/trunk/munin.install)
  munin/repos/testing-any/munin.sysusers
    (from rev 382130, munin/trunk/munin.sysusers)
  munin/repos/testing-any/munin.tmpfiles.conf
    (from rev 382130, munin/trunk/munin.tmpfiles.conf)

------------------------+
 08-munin-font-dir.conf |    7 ++
 Makefile.config        |  141 +++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD               |   98 ++++++++++++++++++++++++++++++++
 logrotate.munin        |    4 +
 logrotate.munin-node   |    4 +
 munin-async.service    |   12 ++++
 munin-cron-entry       |    6 ++
 munin-graph.service    |   11 +++
 munin-graph.socket     |    8 ++
 munin-html.service     |   11 +++
 munin-html.socket      |    8 ++
 munin-node.install     |   15 +++++
 munin-node.service     |   11 +++
 munin.install          |   19 ++++++
 munin.sysusers         |    2 
 munin.tmpfiles.conf    |    1 
 16 files changed, 358 insertions(+)

Copied: munin/repos/testing-any/08-munin-font-dir.conf (from rev 382130, munin/trunk/08-munin-font-dir.conf)
===================================================================
--- testing-any/08-munin-font-dir.conf	                        (rev 0)
+++ testing-any/08-munin-font-dir.conf	2020-05-02 08:42:47 UTC (rev 382131)
@@ -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>

Copied: munin/repos/testing-any/Makefile.config (from rev 382130, munin/trunk/Makefile.config)
===================================================================
--- testing-any/Makefile.config	                        (rev 0)
+++ testing-any/Makefile.config	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,141 @@
+# -*- 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 internal data for master (RRD, internal files, ...)
+DBDIR      = $(DESTDIR)/var/lib/munin
+
+# Where to put internal data for node (plugin state, ...)
+DBDIRNODE  = $(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  = $(DBDIRNODE)/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;' )

Copied: munin/repos/testing-any/PKGBUILD (from rev 382130, munin/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,98 @@
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Evan LeCompte <evanlec at gmail.com>
+
+pkgname=('munin' 'munin-node')
+pkgbase=munin
+pkgver=2.0.61
+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' 'perl-uri' 'perl-module-build')
+source=(munin-$pkgver.tar.gz::https://github.com/munin-monitoring/munin/archive/$pkgver.tar.gz
+        Makefile.config
+        munin-cron-entry
+        logrotate.munin
+        logrotate.munin-node
+        munin.tmpfiles.conf
+        munin-node.service
+        munin-async.service
+        munin-graph.{service,socket}
+        munin-html.{service,socket}
+        08-munin-font-dir.conf
+        munin.sysusers)
+
+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
+	PERL_USE_UNSAFE_INC=1 \
+	make -j1 PREFIX=''
+        make -j1 PREFIX='' common/blib/lib/Munin/Common/Defaults.pm
+}
+
+package_munin() {
+	depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip'
+             'perl-log-log4perl' 'perl-io-socket-inet6'
+             'perl-file-copy-recursive' 'perl-fcgi' 'perl-uri' 'munin-node')
+        optdepends=("perl-cgi-fast: Required by munin-cgi-html")
+	backup=(etc/munin/munin.conf etc/logrotate.d/munin)
+	install=munin.install
+
+
+	cd "$srcdir/munin-$pkgver"
+	PERL5LIB=. 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 ../munin-graph.service "$pkgdir"/usr/lib/systemd/system/munin-graph.service
+	install -D -m644 ../munin-graph.socket "$pkgdir"/usr/lib/systemd/system/munin-graph.socket
+	install -D -m644 ../munin-html.service "$pkgdir"/usr/lib/systemd/system/munin-html.service
+	install -D -m644 ../munin-html.socket "$pkgdir"/usr/lib/systemd/system/munin-html.socket
+	install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf
+	install -D -m644 ../munin.sysusers "$pkgdir"/usr/lib/sysusers.d/munin.conf
+	rm -rf "$pkgdir/run"
+}
+
+package_munin-node() {
+	depends=('perl' 'perl-net-server' 'perl-io-socket-inet6')
+	optdepends=('perl-net-snmp: for SNMP plugins'
+	            'perl-net-ssleay: for SSL/TLS support'
+	            'perl-dbi: for database monitoring plugins'
+	            '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"
+	PERL5LIB=. make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime install-async-prime
+	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
+	install -D -m644 ../munin-node.service "$pkgdir"/usr/lib/systemd/system/munin-node.service
+	install -D -m644 ../munin-async.service "$pkgdir"/usr/lib/systemd/system/munin-async.service
+        install -D -m644 ../munin.sysusers "$pkgdir"/usr/lib/sysusers.d/munin-node.conf
+	rm -rf "$pkgdir/run/"
+	chmod 775 "$pkgdir/var/lib/munin/plugin-state"
+}
+
+md5sums=('a256b16a0fd4a7d16b3c17e7c2c68bcc'
+         'e453f18d0c1a4d9b06abfbcaacad2be4'
+         'dc9c83aa2a278466fb475364462f4119'
+         'eb2f1e6e746e85ce1e91111f40086be0'
+         'cdf139f2b6ae36852113f3411caa6e99'
+         'd124f46e353a7966df093ba803235789'
+         '80afc4a85e2e87d8f1acf7a56d86a37f'
+         'a79180838bc6ecc1a6350b451b9c104f'
+         '7794398d9220d94b824e1b9fe4610795'
+         '332d8d664cc0c7d2d320f81984a81374'
+         '4f0b43284bc9bb98fa60dadc190035d0'
+         '62a593cc011600c96ca947dcb919bc48'
+         'e33a45c3b80a83eecabbe5a9920c1eb6'
+         '58f82d3a8520d9db2c48f1c0d3139853')

Copied: munin/repos/testing-any/logrotate.munin (from rev 382130, munin/trunk/logrotate.munin)
===================================================================
--- testing-any/logrotate.munin	                        (rev 0)
+++ testing-any/logrotate.munin	2020-05-02 08:42:47 UTC (rev 382131)
@@ -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
+}

Copied: munin/repos/testing-any/logrotate.munin-node (from rev 382130, munin/trunk/logrotate.munin-node)
===================================================================
--- testing-any/logrotate.munin-node	                        (rev 0)
+++ testing-any/logrotate.munin-node	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,4 @@
+/var/log/munin/munin-node.log {
+   copytruncate
+   missingok
+}

Copied: munin/repos/testing-any/munin-async.service (from rev 382130, munin/trunk/munin-async.service)
===================================================================
--- testing-any/munin-async.service	                        (rev 0)
+++ testing-any/munin-async.service	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Munin Async Service
+After=syslog.target network.target
+After=munin-node.service
+Requires=munin-node.service
+
+[Service]
+PIDFile=/run/munin/munin-asyncd.pid
+ExecStart=/usr/lib/munin/munin-asyncd
+
+[Install]
+WantedBy=multi-user.target

Copied: munin/repos/testing-any/munin-cron-entry (from rev 382130, munin/trunk/munin-cron-entry)
===================================================================
--- testing-any/munin-cron-entry	                        (rev 0)
+++ testing-any/munin-cron-entry	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,6 @@
+#
+# cron-jobs for munin
+#
+
+*/5 * * * *     test -x /usr/bin/munin-cron && /usr/bin/munin-cron
+

Copied: munin/repos/testing-any/munin-graph.service (from rev 382130, munin/trunk/munin-graph.service)
===================================================================
--- testing-any/munin-graph.service	                        (rev 0)
+++ testing-any/munin-graph.service	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin FastCGI Graph
+Requires=munin-graph.socket
+
+[Service]
+User=munin
+Group=munin
+ExecStart=/usr/share/munin/cgi/munin-cgi-graph
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal

Copied: munin/repos/testing-any/munin-graph.socket (from rev 382130, munin/trunk/munin-graph.socket)
===================================================================
--- testing-any/munin-graph.socket	                        (rev 0)
+++ testing-any/munin-graph.socket	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Munin FastCGI Graph Socket
+
+[Socket]
+ListenStream=/run/munin/fcgi-graph.sock
+
+[Install]
+WantedBy=sockets.target

Copied: munin/repos/testing-any/munin-html.service (from rev 382130, munin/trunk/munin-html.service)
===================================================================
--- testing-any/munin-html.service	                        (rev 0)
+++ testing-any/munin-html.service	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin FastCGI HTML
+Requires=munin-html.socket
+
+[Service]
+User=munin
+Group=munin
+ExecStart=/usr/share/munin/cgi/munin-cgi-html
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal

Copied: munin/repos/testing-any/munin-html.socket (from rev 382130, munin/trunk/munin-html.socket)
===================================================================
--- testing-any/munin-html.socket	                        (rev 0)
+++ testing-any/munin-html.socket	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Munin FastCGI HTML Socket
+
+[Socket]
+ListenStream=/run/munin/fcgi-html.sock
+
+[Install]
+WantedBy=sockets.target

Copied: munin/repos/testing-any/munin-node.install (from rev 382130, munin/trunk/munin-node.install)
===================================================================
--- testing-any/munin-node.install	                        (rev 0)
+++ testing-any/munin-node.install	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,15 @@
+post_install () {
+  # 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 /var/{lib,log}/munin /run/munin
+  chown munin:munin /var/lib/munin/spool
+  chown munin:munin /var/lib/munin/plugin-state
+}

Copied: munin/repos/testing-any/munin-node.service (from rev 382130, munin/trunk/munin-node.service)
===================================================================
--- testing-any/munin-node.service	                        (rev 0)
+++ testing-any/munin-node.service	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin Node Service
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/munin/munin-node.pid
+ExecStart=/usr/bin/munin-node
+
+[Install]
+WantedBy=multi-user.target

Copied: munin/repos/testing-any/munin.install (from rev 382130, munin/trunk/munin.install)
===================================================================
--- testing-any/munin.install	                        (rev 0)
+++ testing-any/munin.install	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,19 @@
+post_install () {
+  # 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 /var/{lib,log}/munin /run/munin
+  chown munin:munin /var/lib/munin/spool
+  fc-cache /usr/lib/munin
+}
+
+post_remove() {
+  fc-cache /usr/lib/munin
+}

Copied: munin/repos/testing-any/munin.sysusers (from rev 382130, munin/trunk/munin.sysusers)
===================================================================
--- testing-any/munin.sysusers	                        (rev 0)
+++ testing-any/munin.sysusers	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1,2 @@
+u	munin	-	"Munin system monitor"	/var/lib/munin	/bin/false
+

Copied: munin/repos/testing-any/munin.tmpfiles.conf (from rev 382130, munin/trunk/munin.tmpfiles.conf)
===================================================================
--- testing-any/munin.tmpfiles.conf	                        (rev 0)
+++ testing-any/munin.tmpfiles.conf	2020-05-02 08:42:47 UTC (rev 382131)
@@ -0,0 +1 @@
+d /run/munin 0755 munin munin -


More information about the arch-commits mailing list