From 299a4b274ccdf0e47d2f89d9362bca167df6834b Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Tue, 12 Sep 2017 09:41:50 +0000 Subject: [PATCH] Documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808093 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directives.html.en | 2 + docs/manual/mod/mod_md.html.en | 61 +++++++++++++++++++------- docs/manual/mod/quickreference.html.en | 24 +++++----- 3 files changed, 61 insertions(+), 26 deletions(-) diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index d41cb0f408..4755a6b0f5 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -453,7 +453,9 @@
  • MDCertificateAuthority
  • MDCertificateProtocol
  • MDDriveMode
    • +
  • MDHttpProxy
  • MDMember
    • +
  • MDMembers
  • MDPortMap
  • MDPrivateKeys
  • MDRenewWindow
    • diff --git a/docs/manual/mod/mod_md.html.en b/docs/manual/mod/mod_md.html.en index 535c8e082c..b68cd7360f 100644 --- a/docs/manual/mod/mod_md.html.en +++ b/docs/manual/mod/mod_md.html.en @@ -90,7 +90,9 @@
  • MDCertificateAuthority
  • MDCertificateProtocol
  • MDDriveMode
    • +
  • MDHttpProxy
  • MDMember
    • +
  • MDMembers
  • MDPortMap
  • MDPrivateKeys
  • MDRenewWindow
    • @@ -103,7 +105,7 @@
    top

    ManagedDomain Directive

    - + @@ -176,7 +178,7 @@ ManagedDomain example.org www.example.org
    top

    <ManagedDomain> Directive

    Description:Define list of domain names that belong to one group
    Description:Define list of domain names that belong to one group.
    Syntax:ManagedDomain dns-name [ other-dns-name... ]
    Context:server config
    Status:Extension
    - + @@ -199,7 +201,7 @@ ManagedDomain example.org www.example.org
    top

    MDCAChallenges Directive

    Description:Container for directives applied to the same managed domains
    Description:Container for directives applied to the same managed domains.
    Syntax:<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>
    Context:server config
    Status:Extension
    - + @@ -238,7 +240,7 @@ ManagedDomain example.org www.example.org mail.example.org
    top

    MDCertificateAuthority Directive

    Description:
    Description:Type of ACME challenge used to prove domain ownership.
    Syntax:MDCAChallenges name [ name ... ]
    Default:MDCAChallenges tls-sni-01 http-01
    Context:server config
    - + @@ -261,7 +263,7 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2
    top

    MDCertificateProtocol Directive

    Description:The URL of the ACME CA service
    Description:The URL of the ACME Certificate Authority service.
    Syntax:MDCertificateAuthority url
    Default:MDCertificateAuthority https://acme-v01.api.letsencrypt.org/directory
    Context:server config
    - + @@ -274,7 +276,7 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2
    top

    MDDriveMode Directive

    Description:The protocol to use with the CA
    Description:The protocol to use with the Certificate Authority.
    Syntax:MDCertificateProtocol protocol
    Default:MDCertificateProtocol ACME
    Context:server config
    - + @@ -297,11 +299,24 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2 check if the MD is actually used somewhere.

    + +
    top
    +

    MDHttpProxy Directive

    +
    Description:Controls when mod_md will try to obtain/renew certificates.
    Description:Control when mod_md will try to obtain/renew certificates.
    Syntax:MDDriveMode always|auto|manual
    Default:MDDriveMode auto
    Context:server config
    + + + + + + +
    Description:The URL of the HTTP proxy to use.
    Syntax:MDHttpProxy url
    Default:MDHttpProxy
    Context:server config
    Status:Extension
    Module:mod_md
    +

    Use a HTTP proxy to connect to the MDCertificateAuthority url.

    +
    top

    MDMember Directive

    - + @@ -318,17 +333,33 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2 </ManagedDomain example.org>

    - 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 - description of these special values. + 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 + description of these special values. +

    + + +
    top
    +

    MDMembers Directive

    +
    Description:Additional hostname for the managed domain
    Description:Additional hostname for the managed domain.
    Syntax:MDMember hostname
    Context:server config
    Status:Extension
    + + + + + + +
    Description:Control if the alias domain names are automatically added.
    Syntax:MDMembers auto|manual
    Default:MDDriveMode auto
    Context:server config
    Status:Extension
    Module:mod_md
    +

    Defines if the ServerName and + ServerAlias values of a VirtualHost + are automatically added to the members of a Managed Domain or not.

    top

    MDPortMap Directive

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

    MDPrivateKeys Directive

    Description:
    Description:Map external to internal ports for domain ownership verification.
    Syntax:MDPortMap map1 [ map2 ]
    Default:MDPortMap 80:80 443:443
    Context:server config
    - + @@ -394,7 +425,7 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2
    top

    MDRenewWindow Directive

    Description:
    Description:Set type and size of the private keys generated.
    Syntax:MDPrivateKeys type [ params... ]
    Default:MDPrivateKeys RSA 2048
    Context:server config
    - + @@ -415,7 +446,7 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2
    top

    MDStoreDir Directive

    Description:
    Description:Control when a certificate will be renewed.
    Syntax:MDRenewWindow duration
    Default:MDRenewWindow 14d
    Context:server config
    - + diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 569ede3fca..b58543780e 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -704,8 +704,8 @@ processing ... </Macro> - - + + - + - - - - - - - - + + + + + + + + + +
    Description:
    Description:Path on the local file system to store the Managed Domains data.
    Syntax:MDStoreDir path
    Default:MDStoreDir md
    Context:server config
    svdB
    Define a configuration file macro
    MacroIgnoreBadNestingsvdB
    Ignore warnings, and does not log, about bad nesting of Macros
    MacroIgnoreEmptyArgssvdB
    Ignore warnings, and does not log, about empty Macro argument(s)
    ManagedDomain dns-name [ other-dns-name... ]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sE
    Define list of domain names that belong to one groupContainer for directives applied to the same managed domains
    ManagedDomain dns-name [ other-dns-name... ]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sE
    Define list of domain names that belong to one groupContainer for directives applied to the same managed domains
    ManagedDomain dns-name [ other-dns-name... ]<ManagedDomain dns-name [ other-dns-name... ]>...</ManagedDomain>sE
    Define 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>sE
    Define list of domain names that belong to one group.Container for directives applied to the same managed domains.
    MaxConnectionsPerChild number 0 sM
    Limit on the number of connections that an individual child server will handle during its life
    MaxKeepAliveRequests number 100 svC
    Number of requests allowed on a persistent @@ -723,16 +723,18 @@ simultaneously
    MaxSpareServers number 10 sM
    Maximum number of idle child server processes
    MaxSpareThreads numbersM
    Maximum number of idle threads
    MaxThreads number 2048 sM
    Set the maximum number of worker threads
    MDCAChallenges name [ name ... ] tls-sni-01 http-01 sE
    -
    MDCAChallenges name [ name ... ] tls-sni-01 http-01 sE
    Type of ACME challenge used to prove domain ownership.
    MDCertificateAgreement url-of-terms-of-servicesE
    The URL of the Terms-of-Service document, that the CA server requires you to accept.
    MDCertificateAuthority url https://acme-v01.ap +sE
    The URL of the ACME CA service
    MDCertificateProtocol protocol ACME sE
    The protocol to use with the CA
    MDDriveMode always|auto|manual auto sE
    Controls when mod_md will try to obtain/renew certificates.
    MDMember hostnamesE
    Additional hostname for the managed domain
    MDPortMap map1 [ map2 ] 80:80 443:443 sE
    -
    MDPrivateKeys type [ params... ] RSA 2048 sE
    -
    MDRenewWindow duration 14d sE
    -
    MDStoreDir path md sE
    -
    MDCertificateAuthority url https://acme-v01.ap +sE
    The URL of the ACME Certificate Authority service.
    MDCertificateProtocol protocol ACME sE
    The protocol to use with the Certificate Authority.
    MDDriveMode always|auto|manual auto sE
    Control when mod_md will try to obtain/renew certificates.
    MDHttpProxy url sE
    The URL of the HTTP proxy to use.
    MDMember hostnamesE
    Additional hostname for the managed domain.
    MDMembers auto|manualsE
    Control if the alias domain names are automatically added.
    MDPortMap map1 [ map2 ] 80:80 443:443 sE
    Map external to internal ports for domain ownership verification.
    MDPrivateKeys type [ params... ] RSA 2048 sE
    Set type and size of the private keys generated.
    MDRenewWindow duration 14d sE
    Control when a certificate will be renewed.
    MDStoreDir path md sE
    Path on the local file system to store the Managed Domains data.
    MemcacheConnTTL num[units] 15s svE
    Keepalive time for idle connections
    MergeTrailers [on|off] off svC
    Determines whether trailers are merged into headers
    MetaDir directory .web svdhE
    Name of the directory to find CERN-style meta information -- 2.50.1