From 1fdb08203fe4f9bf6bfb1ac9f23b5b380650dfc1 Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Sun, 3 Dec 2017 10:04:52 +0000 Subject: [PATCH] Documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1817024 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_md.html.en | 22 +++++++++++++--------- docs/manual/mod/quickreference.html.en | 4 ++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docs/manual/mod/mod_md.html.en b/docs/manual/mod/mod_md.html.en index 15e4942d4d..e58acfc89b 100644 --- a/docs/manual/mod/mod_md.html.en +++ b/docs/manual/mod/mod_md.html.en @@ -109,7 +109,7 @@

ManagedDomain Directive

- + @@ -183,8 +183,8 @@ ManagedDomain example2.org auto explicitly. Whenever you add more ServerAlias names to this virtual host, they will be added as well to the Manged Domain.

- If this is too much automagic for you, define 'manual' mode. - mod_md will then complain if the names do not match. + If you prefer to explicitly declare all the domain names, use 'manual' mode. + An error will be logged if the names do not match with the expected ones.

@@ -208,6 +208,10 @@ ManagedDomain example2.org auto MDCertificateAgreement https://someotherca.com/terms/v_1.02.pdf </ManagedDomain> +

This is a specialized version of ManagedDomain, + it should be used only when a fine grained configuration is required. + ManagedDomain is the suggested choice + for the general use case.

top
@@ -221,9 +225,9 @@ ManagedDomain example2.org auto
Description:Define list of domain names that belong to one group.
Syntax:ManagedDomain dns-name [ other-dns-name... ]
Syntax:ManagedDomain dns-name [ other-dns-name... ] [auto|manual]
Context:server config
Status:Extension
Module:mod_md
Module:mod_md

- This tells mod_md which challenge types it shall use in - which order when proving domain ownership. The names are protocol specific. The - current ACME protocol version that Let's Encrypt speaks defines two challenge + Sets challenge types and their execution order when proving domain ownership. + The names are protocol specific. + The current ACME protocol version implemented by Let's Encrypt defines two challenge types that are supported by mod_md. By default, it will try the one on port 443 when available.

@@ -307,8 +311,8 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2 This can be useful in clustered setups where you want just one node to perform the driving.

- The third mode 'always' is like 'auto' only that mod_md will not - check if the MD is actually used somewhere. + The third mode 'always' is like 'auto', with the difference that + mod_md will not check if the MD is actually used.

@@ -348,7 +352,7 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2

If you use it in the global context, outside a specific MD, you can only specify one value, 'auto' or 'manual' as the default for all other MDs. See - <ManagedDomain> for a + ManagedDomain for a description of these special values.

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index cd8441c690..8532ae477d 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -704,8 +704,8 @@ processing ... </Macro>svdBDefine a configuration file macro MacroIgnoreBadNestingsvdBIgnore warnings, and does not log, about bad nesting of Macros MacroIgnoreEmptyArgssvdBIgnore warnings, and does not log, about empty Macro argument(s) -ManagedDomain dns-name [ other-dns-name... ]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sEDefine list of domain names that belong to one group.Container for directives applied to the same managed domains. -ManagedDomain dns-name [ other-dns-name... ]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sEDefine list of domain names that belong to one group.Container for directives applied to the same managed domains. +ManagedDomain dns-name [ other-dns-name... ] [auto|manual]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sEDefine list of domain names that belong to one group.Container for directives applied to the same managed domains. +ManagedDomain dns-name [ other-dns-name... ] [auto|manual]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sEDefine list of domain names that belong to one group.Container for directives applied to the same managed domains. MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server will handle during its life MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent -- 2.40.0