diff --git a/doc/installation/configuration.rst b/doc/installation/configuration.rst index f785252e7e..2bd9705d90 100644 --- a/doc/installation/configuration.rst +++ b/doc/installation/configuration.rst @@ -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 `_. 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 ------- diff --git a/doc/installation/webserver.rst b/doc/installation/webserver.rst index e9b6ac56e9..1249724b94 100644 --- a/doc/installation/webserver.rst +++ b/doc/installation/webserver.rst @@ -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: diff --git a/doc/reference/munin-httpd.rst b/doc/reference/munin-httpd.rst index e3c2ff8e0c..53433fc20b 100644 --- a/doc/reference/munin-httpd.rst +++ b/doc/reference/munin-httpd.rst @@ -6,6 +6,8 @@ munin-httpd ============= +.. note:: munin-httpd was introduced in the munin 3.0 release series. + DESCRIPTION ===========