Your message dated Thu, 29 Aug 2013 21:35:01 +0000
with message-id <[email protected]>
and subject line Bug#684466: fixed in munin 2.0.17-2
has caused the Debian Bug report #684466,
regarding munin: Provide example configuration for nginx setup
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
684466: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684466
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: munin
Version: 2.0.2-1
Severity: wishlist
Tags: patch
Dear Maintainer,
The package provide a default apache configuration, following is a patch to
provide an nginx one as examples.
Can we think about providing two packages:
- muning-nginx: to configure nginx with debconf questions, like
local(unix socket)/remote (tcp/ip) FastCGI
- munin-fcgi: to enable spawn-fcgi init scripts with debconf questions
to enable munin-cgi-html or munin-cgi-graph or both.
Regards.
From df64f32374ab98a1fe36e7ac4fd5d70f40d9664e Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <[email protected]>
Date: Fri, 10 Aug 2012 10:51:41 +0200
Subject: [PATCH] Install examples for configuration with nginx and FastCGI
* debian/munin.examples: Install examples files
* debian/munin.nginx.conf: Configuration sample for nginx
* debian/munin-cgi.conf: Configuration to disable generation of html and
graphs, should be put under /etc/munin/munin-conf.d/
* debian/munin-cgi-graph.init: Init script to start munin-cgi-graph.
* debian/munin-cgi-html.init: Init script to start munin-cgi-html.
---
debian/munin-cgi-graph.init | 116 ++++++++++++++++++++++++++++++++++++++++++
debian/munin-cgi-html.init | 117 +++++++++++++++++++++++++++++++++++++++++++
debian/munin-cgi.conf | 17 +++++++
debian/munin.examples | 4 ++
debian/munin.nginx.conf | 47 +++++++++++++++++
5 files changed, 301 insertions(+)
create mode 100644 debian/munin-cgi-graph.init
create mode 100644 debian/munin-cgi-html.init
create mode 100644 debian/munin-cgi.conf
create mode 100644 debian/munin.examples
create mode 100644 debian/munin.nginx.conf
diff --git a/debian/munin-cgi-graph.init b/debian/munin-cgi-graph.init
new file mode 100644
index 0000000..39ce66e
--- /dev/null
+++ b/debian/munin-cgi-graph.init
@@ -0,0 +1,116 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides: munin-cgi-graph
+# Required-Start: $network $named $local_fs $remote_fs
+# Required-Stop: $network $named $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: starts FastCGI for Munin-Graph
+# Description: starts FastCGI for Munin-Graph using start-stop-daemon
+### END INIT INFO
+# --------------------------------------------------------------
+# Based on Munin-CGI-Graph Spawn-FCGI Startscript by Julien Schmidt
+# eMail: munin-trac at julienschmidt.com
+# www: http://www.julienschmidt.com
+# --------------------------------------------------------------
+# Install:
+# 1. Copy this file to /etc/init.d
+# 2. run "update-rc.d munin-cgi-graph defaults"
+# --------------------------------------------------------------
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=munin-cgi-graph
+PID_FILE="/var/run/munin/$NAME.pid"
+SOCK_FILE="/var/run/munin/$NAME.socket"
+CGI_SCRIPT="/usr/lib/cgi-bin/$NAME"
+DAEMON=/usr/bin/spawn-fcgi
+DAEMON_OPTS="-s $SOCK_FILE -U www-data -u munin -g munin -P $PID_FILE --
$CGI_SCRIPT"
+
+# --------------------------------------------------------------
+# No edits necessary beyond this line
+# --------------------------------------------------------------
+
+if [ ! -x $DAEMON ]; then
+ echo "File not found or is not executable: $DAEMON!"
+ exit 0
+fi
+
+status() {
+ if [ ! -r $PID_FILE ]; then
+ return 1
+ fi
+
+ FCGI_PID=`cat $PID_FILE`
+ if [ -z "${FCGI_PID}" ]; then
+ return 1
+ fi
+
+ FCGI_RUNNING=`ps -p ${FCGI_PID} | grep ${FCGI_PID}`
+ if [ -z "${FCGI_RUNNING}" ]; then
+ return 1
+ fi
+
+ return 0
+}
+
+start() {
+ if status; then
+ echo "FCGI is already running!"
+ exit 1
+ else
+ $DAEMON $DAEMON_OPTS
+ fi
+}
+
+stop () {
+ if ! status; then
+ echo "No PID-file at $PID_FILE found or PID not valid. Maybe
not running"
+ exit 1
+ fi
+
+ # Kill process
+ kill -9 `cat $PID_FILE`
+
+ # Remove PID-file
+ rm -f $PID_FILE
+
+ # Remove Sock-File
+ rm -f $SOCK_FILE
+}
+
+case "$1" in
+ start)
+ echo "Starting $NAME: "
+ start
+ echo "... DONE"
+ ;;
+
+ stop)
+ echo "Stopping $NAME: "
+ stop
+ echo "... DONE"
+ ;;
+
+ force-reload|restart)
+ echo "Stopping $NAME: "
+ stop
+ start
+ echo "... DONE"
+ ;;
+
+ status)
+ if status; then
+ echo "FCGI is RUNNING"
+ else
+ echo "FCGI is NOT RUNNING"
+ fi
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/debian/munin-cgi-html.init b/debian/munin-cgi-html.init
new file mode 100644
index 0000000..83cdaba
--- /dev/null
+++ b/debian/munin-cgi-html.init
@@ -0,0 +1,117 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides: munin-cgi-html
+# Required-Start: $network $named $local_fs $remote_fs
+# Required-Stop: $network $named $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: starts FastCGI for Munin-HTML
+# Description: starts FastCGI for Munin-HTML using start-stop-daemon
+### END INIT INFO
+# --------------------------------------------------------------
+# Based on Munin-CGI-Graph Spawn-FCGI Startscript by Julien Schmidt
+# eMail: munin-trac at julienschmidt.com
+# www: http://www.julienschmidt.com
+# --------------------------------------------------------------
+# Install:
+# 1. Copy this file to /etc/init.d
+# 2. run "update-rc.d munin-cgi-html defaults"
+# --------------------------------------------------------------
+
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=munin-cgi-html
+PID_FILE="/var/run/munin/$NAME.pid"
+SOCK_FILE="/var/run/munin/$NAME.socket"
+CGI_SCRIPT="/usr/lib/cgi-bin/$NAME"
+DAEMON=/usr/bin/spawn-fcgi
+DAEMON_OPTS="-s $SOCK_FILE -U www-data -u munin -g munin -P $PID_FILE --
$CGI_SCRIPT"
+
+# --------------------------------------------------------------
+# No edits necessary beyond this line
+# --------------------------------------------------------------
+
+if [ ! -x $DAEMON ]; then
+ echo "File not found or is not executable: $DAEMON!"
+ exit 0
+fi
+
+status() {
+ if [ ! -r $PID_FILE ]; then
+ return 1
+ fi
+
+ FCGI_PID=`cat $PID_FILE`
+ if [ -z "${FCGI_PID}" ]; then
+ return 1
+ fi
+
+ FCGI_RUNNING=`ps -p ${FCGI_PID} | grep ${FCGI_PID}`
+ if [ -z "${FCGI_RUNNING}" ]; then
+ return 1
+ fi
+
+ return 0
+}
+
+start() {
+ if status; then
+ echo "FCGI is already running!"
+ exit 1
+ else
+ $DAEMON $DAEMON_OPTS
+ fi
+}
+
+stop () {
+ if ! status; then
+ echo "No PID-file at $PID_FILE found or PID not valid. Maybe
not running"
+ exit 1
+ fi
+
+ # Kill process
+ kill -9 `cat $PID_FILE`
+
+ # Remove PID-file
+ rm -f $PID_FILE
+
+ # Remove Sock-File
+ rm -f $SOCK_FILE
+}
+
+case "$1" in
+ start)
+ echo "Starting $NAME: "
+ start
+ echo "... DONE"
+ ;;
+
+ stop)
+ echo "Stopping $NAME: "
+ stop
+ echo "... DONE"
+ ;;
+
+ force-reload|restart)
+ echo "Stopping $NAME: "
+ stop
+ start
+ echo "... DONE"
+ ;;
+
+ status)
+ if status; then
+ echo "FCGI is RUNNING"
+ else
+ echo "FCGI is NOT RUNNING"
+ fi
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/debian/munin-cgi.conf b/debian/munin-cgi.conf
new file mode 100644
index 0000000..6226259
--- /dev/null
+++ b/debian/munin-cgi.conf
@@ -0,0 +1,17 @@
+## Disable generation of graph and html by munin-cron
+## Put this file under /etc/munin/munin-conf.d/
+
+# Graphics files are normally generated on-demand by a CGI process.
+# See http://munin-monitoring.org/wiki/CgiHowto2 for more
+# documentation. Since 2.0, there is no official support for cron running
+# munin-graph. It has been rewritten to use the cgi code.
+# It is single threaded *by design* now.
+#
+graph_strategy cgi
+
+# HTML files are normally generated by munin-html, no matter if the
+# files are used or not. You can change this to on-demand generation
+# by following the instructions in
+# http://munin-monitoring.org/wiki/CgiHowto2
+#
+html_strategy cgi
diff --git a/debian/munin.examples b/debian/munin.examples
new file mode 100644
index 0000000..d4cfed4
--- /dev/null
+++ b/debian/munin.examples
@@ -0,0 +1,4 @@
+debian/munin-cgi-graph.init
+debian/munin-cgi-html.init
+debian/munin-cgi.conf
+debian/munin.nginx.conf
diff --git a/debian/munin.nginx.conf b/debian/munin.nginx.conf
new file mode 100644
index 0000000..3e00e7f
--- /dev/null
+++ b/debian/munin.nginx.conf
@@ -0,0 +1,47 @@
+##
+# Example configuration for munin using munin-cgi-html and
+# munin-cgi-graph as FastCGI
+#
+# Put this file in /etc/nginx/sites-available and link it in
+# /etc/nginx/sites-enabled
+#
+# In addition, the Munin log files and html area should be writable
+# to the web server.
+#
+# Based on http://munin-monitoring.org/wiki/CgiHowto2#nginx
+##
+
+server {
+ listen 127.0.0.1;
+
+ root /var/cache/munin;
+
+ access_log /var/log/nginx/munin-access.log;
+ error_log /var/log/nginx/munin-errors.log;
+
+ # Make site accessible from http://localhost/
+ server_name localhost;
+
+ location / {
+ deny all;
+ }
+
+ location /munin/static/ {
+ alias /etc/munin/static/;
+ expires 31d;
+ }
+
+ location /munin/ {
+ fastcgi_split_path_info ^(/munin)(.*);
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_pass unix:/var/run/munin/munin-cgi-html.socket;
+ include fastcgi_params;
+ }
+
+ location ^~ /cgi-bin/munin-cgi-graph/ {
+ fastcgi_split_path_info ^(/cgi-bin/munin-cgi-graph)(.*);
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_pass unix:/var/run/munin/munin-cgi-graph.socket;
+ include fastcgi_params;
+ }
+}
--
1.7.10.4
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (90, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0+hati.2 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF
pgpKDwCiDUrGQ.pgp
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: munin
Source-Version: 2.0.17-2
We believe that the bug you reported is fixed in the latest version of
munin, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Holger Levsen <[email protected]> (supplier of updated munin package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 29 Aug 2013 20:58:58 +0000
Source: munin
Binary: munin-node munin-plugins-core munin-plugins-extra munin-plugins-java
munin munin-common munin-async munin-doc
Architecture: source all
Version: 2.0.17-2
Distribution: unstable
Urgency: low
Maintainer: Munin Debian Maintainers <[email protected]>
Changed-By: Holger Levsen <[email protected]>
Description:
munin - network-wide graphing framework (grapher/gatherer)
munin-async - network-wide graphing framework (async master/client)
munin-common - network-wide graphing framework (common)
munin-doc - network-wide graphing framework (documentation)
munin-node - network-wide graphing framework (node)
munin-plugins-core - network-wide graphing framework (plugins for node)
munin-plugins-extra - network-wide graphing framework (user contributed
plugins for nod
munin-plugins-java - network-wide graphing framework (java plugins for node)
Closes: 684466 718959 720275 720280
Changes:
munin (2.0.17-2) unstable; urgency=low
.
[ Matthias Schmitz ]
* Don't remove munin's apache2.4 configuration on removal. This is the
behavior as we do with the apache2.2 configuration.
* As apache2-maintscript-helper doesn't work if called from a function we now
give $@ of the postinst to our apache_install function. (Closes: #718959)
.
[ Holger Levsen ]
* munin-async.init:
- provide LSB status command.
- fix $SCRIPTNAME.
- rm pid file on stop.
Thanks to Daniel Black for the patch. (Closes: #720280)
* munin-node.cron.d: use munin-run to run plugins. (Closes: #720275)
* Provide examples how to configure munin for nginx, thanks to Daniel
Dehennin. (Closes: #684466)
Checksums-Sha1:
f16ea6c9e6225f8963514492878d7e0b834e4edc 2308 munin_2.0.17-2.dsc
db7a7e0cf9438a1e32e0f3b22081e7a6e91c4725 52182 munin_2.0.17-2.diff.gz
7a51d59658292e55e1864485a80028fbe3b91649 127806 munin-node_2.0.17-2_all.deb
6a1b87b8202ceacfd45dbda8981a91d754d63484 237508
munin-plugins-core_2.0.17-2_all.deb
c6e1839d0529165ff3560c7a2f8337093cce1d7e 144006
munin-plugins-extra_2.0.17-2_all.deb
1c5682e8f7a45d78be9d0f73859d6a9fe9ead671 152484
munin-plugins-java_2.0.17-2_all.deb
6402641d897b7343655d4b7972174562008f54c5 186750 munin_2.0.17-2_all.deb
36b9ae877365eb903180d7b88884f62fe6fca611 98848 munin-common_2.0.17-2_all.deb
fe1d3fd5171b16f924ff0cd689b53943e16ba0dc 92664 munin-async_2.0.17-2_all.deb
0e2ea8bcb8839ebb7f6b237e77233e54ad137c49 222250 munin-doc_2.0.17-2_all.deb
Checksums-Sha256:
b9cefa47c001caac3ed1b33a130c5f0f4e52e2deb8f50c7f03c5d09a232ca5ef 2308
munin_2.0.17-2.dsc
d47c66a1532f2e58b9a1e5f70fc072270cdbbf92bfdb8ea304e08014fcd3da8a 52182
munin_2.0.17-2.diff.gz
f35dbb000741073779f23a9187895307cf9e4291b81d0f130b341079477246d0 127806
munin-node_2.0.17-2_all.deb
81c9a59413548ca82bb64e46e788ddaeef979cc4df96b1d92784f4c18f9be85c 237508
munin-plugins-core_2.0.17-2_all.deb
b9922c8e564872718b02f6c1211e1045647e4c3a7ffb8bb75055f4175bed3e44 144006
munin-plugins-extra_2.0.17-2_all.deb
7023a735f2cdf2b86f999a647c5b355d5074884c767131dfa2e4c11ab3502ea7 152484
munin-plugins-java_2.0.17-2_all.deb
83eb930301a358de20ecc6fddc11ce2c122108a02b20abd0e4379d1c57e5ae4f 186750
munin_2.0.17-2_all.deb
ac6a9de74d2dfcad5d5d6ba7182cae1f1334335c3b42dae04b668234f1d923a7 98848
munin-common_2.0.17-2_all.deb
16cd14f0bd368646e0b662a8dc67dbdeadfe93fdee663b4b47b4d470e497d7b4 92664
munin-async_2.0.17-2_all.deb
563e0268b28a36a0a64478d6bb7f338e6b93d757802fb0c993f3618f7adc2def 222250
munin-doc_2.0.17-2_all.deb
Files:
3db94f1f6eeaad7c7cdb09d777918fb3 2308 net optional munin_2.0.17-2.dsc
250c5df495a01133116c15aff5a29aef 52182 net optional munin_2.0.17-2.diff.gz
cb5d0ddbe4a7b97b1066bb2bd0be8c12 127806 net optional
munin-node_2.0.17-2_all.deb
785ccd70ba6744139f17631b04199207 237508 net optional
munin-plugins-core_2.0.17-2_all.deb
44342c1df4c62d84175a6614b9dc29d4 144006 net optional
munin-plugins-extra_2.0.17-2_all.deb
093eebee07bb73df634458d3087db1b9 152484 net optional
munin-plugins-java_2.0.17-2_all.deb
0e249e638b03fbc634a69c6ff2839bd3 186750 net optional munin_2.0.17-2_all.deb
51a5ebe1c66c0778dd4c15ddf88f9ce4 98848 net optional
munin-common_2.0.17-2_all.deb
79d3adbb8ea75b38d5bed36ad3a09d04 92664 net optional
munin-async_2.0.17-2_all.deb
c1fc52f47259226e1accccba9bdeff6f 222250 doc optional munin-doc_2.0.17-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUBUh+44wkauFYGmqocAQiJNg/9FrP/8BFzGPt7FueiJOHlseBFVgfDBK43
aBFFoG/u0EnwjRQDF3xV5n9wULuSHBCOR80hDiB+I2Wauji9gLqtIVxl1u+9RZiw
A1fUqhwHwVoCXUZ01boc2qpemA7tZYBTi4W8IMJp8cmELSyOga6uqfCbN7UzVIMD
Ah8blutgaaUdq6pXzfkdGJS1FDyAoaQFwFMjXB0nfon4c8rpekdmFW2/Bb8nFpg7
Fx+YZjhdZAFiGviZGBxn834gQlbjMfMbSSeRIsn3ZyRi5Z+Ww0wFwDa2TKVY5rc6
nv6OaHzVLheCS5ydtXwh/ddl1K7Gh0lqJDM/3Zsr9ZhF6T52iFdiR32547lyELLb
WnuDYvCAlaTS2eUfP6dI2q4j7pucsAn9MlWAinLPyPQQioPY82c8gHDa6avEAe1D
lmzWTd3i+BWczPzjV1cz7o+ILk/LQBkPh+a7pGl5ybCTCIw0EBX3Bx4opNkxLjOo
6hatdO+kLS7MOxP+R0I+PhB26SHp1wUIr3MAZXwcmGRq9MunWRmeb5DXvItiunCl
l8Su63eIVxIEU1qywfxXn4xuETo5PQ/M8ZkieWtC17Aou8ZjmRmKpi6D32X1JhNI
K8KmnBaILxFyLX2ffD7BnKQfHDr1vGi0e1Phv9SQCXY/rKNlhAld/8sCe7A5Bhn1
vaKh43WmkIE=
=nvi+
-----END PGP SIGNATURE-----
--- End Message ---
