Skip to content

Commit

Permalink
doc: improve description of configuration and access control
Browse files Browse the repository at this point in the history
Thanks: dolf_ via IRC
  • Loading branch information
sumpfralle committed Jun 27, 2019
1 parent aac8219 commit 3622d02
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
17 changes: 11 additions & 6 deletions doc/installation/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,30 @@ Access
------

The munin node listens on all interfaces by default, but has a
restrictive access list. You need to add your master's IP address.
restrictive access list. You need to add your master's IP address
to ``/etc/munin/munin-node.conf``.

The "cidr_allow", "cidr_deny", "allow" and "deny" statements are used.
The ``cidr_allow``, ``cidr_deny``, ``allow`` and ``deny`` directives
are related to access control.

cidr_allow uses the following syntax (the /32 is not implicit, so for
``cidr_allow`` expects the following notation:
syntax (the /32 is not implicit, so for
a single host, you need to add it):

| cidr_allow 127.0.0.0/8
| cidr_allow 192.0.2.1/32
allow uses regular expression matching against the client IP address.
Please note, that the prefix length (e.g. ``/32``) is mandatory for
``cidr_allow`` and ``cidr_deny``.

``allow`` uses regular expression matching against the client IP address.

| allow '^127\.'
| allow '^192\.0\.2\.1$'
For specific information about the syntax, see `Net::Server
<http://search.cpan.org/dist/Net-Server/lib/Net/Server.pod>`_. Please
keep in mind that cidr_allow is a recent addition, and may not be
available on all systems.
keep in mind that ``cidr_allow`` requires the ``Net::CIDR`` perl module.

Startup
-------
Expand Down
3 changes: 3 additions & 0 deletions doc/installation/webserver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ On the master, you need to configure a web server.

If you have installed "munin" through distribution
packages, a webserver may have been configured for you already.
Details of such packaged setups depend on your distribution.
For example in Debian (or derivatives) you may want to take a look
at ``/usr/share/doc/munin/README.Debian``.

If you installed from source, you may want to take a look at the following examples:

Expand Down
2 changes: 2 additions & 0 deletions doc/reference/munin-httpd.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
munin-httpd
=============

.. note:: munin-httpd was introduced in the munin 3.0 release series.

DESCRIPTION
===========

Expand Down

0 comments on commit 3622d02

Please # to comment.