Merge pull request #568 from domcleal/509-110-settings

Document new 1.10.0 configuration options

_includes/manuals/1.10/3.5.2_configuration_options.md

@@ -207,6 +207,12 @@ Default: production
 A Smart-variable's match criteria are evaluated in a specific order and if this search order is not provided then _Default_variables_Lookup_Path_ is used.
 Default: ["fqdn", "hostgroup", "os", "domain"]
 
+##### dns_conflict_timeout
+
+When updating a host and DNS conflict detection is performed, each lookup for A and PTR records will be limited to this time in seconds.
+Default: 3 (seconds)
+See also: query_local_nameservers
+
 ##### document_root
 
 Puppetdoc will create RDoc documents for your manifests if its available. This setting allows you to select the directory where you want these documents to be created.
@@ -262,6 +268,13 @@ Default: true
 
 If this option is set to _true_ then Foreman will not update the IP and MAC addresses stored on a host's network interfaces with the values that it receives from facts. It will also include Foreman's values for IP and MAC to Puppet in its node/ENC information.
 Default: false
+See also: ignored_interface_identifiers
+
+##### ignored_interface_identifiers
+
+When importing facts and updating stored information on network interfaces, any network interface with an identifier (e.g. `eth0`) that matches any of the items in this list will be ignored and not updated. This can be used to avoid updating special types of interfaces when Foreman has limited or no understanding of them. The contents are an array of strings which may contain `*` wildcards to match zero or more characters.
+Default: `['lo', 'usb*', 'vnet*', 'macvtap*']`
+See also: ignore_puppet_facts_for_provisioning
 
 ##### legacy_puppet_hostname
 
@@ -362,6 +375,7 @@ Default: false
 
 If _true_, Foreman will query the local DNS. When _false_ Foreman will query the SOA/NS authority. Warning! Querying a resolver can cause Foreman to get false positives when checking presence of DNS records due to caching.
 Default: false
+See also: dns_conflict_timeout
 
 ##### remote_addr
 
@@ -454,15 +468,17 @@ Default: false
 ##### use_gravatar
 
 Display user avatars by matching their emails with emails at Gravatar.com
-Default: true
+Default: false
 
 ##### use_uuid_for_certificates
 
 When enabled, Foreman will generate UUIDs for each host instead of using the hostname as the Puppet certname, which is more reliable with changing hostnames.  Note that when disabling this setting, existing stored certnames won't be changed or discarded until new certificates are requested from a host (i.e. on a rebuild), in order that the existing certificate remains known to Foreman and can be revoked.
 
 ##### websockets_encrypt
 
-When enabled, virtual machine consoles using NoVNC will always be sent over an encrypted WebSocket connection.  When set to 'auto', it will be enabled if the session is using HTTPS and both websockets_ssl_key and websockets_ssl_cert are set.
+When enabled, virtual machine consoles using NoVNC will always be sent over an encrypted WebSocket connection. Requires both `websockets_ssl_cert` and `websockets_ssl_key` to be configured too.
+Default: true if `require_ssl` is enabled
+See also: websockets_ssl_cert, websockets_ssl_key
 
 ##### websockets_ssl_cert
 

_includes/manuals/1.11/3.5.2_configuration_options.md

@@ -212,6 +212,12 @@ Default: production
 A Smart-variable's match criteria are evaluated in a specific order and if this search order is not provided then _Default_variables_Lookup_Path_ is used.
 Default: ["fqdn", "hostgroup", "os", "domain"]
 
+##### dns_conflict_timeout
+
+When updating a host and DNS conflict detection is performed, each lookup for A and PTR records will be limited to this time in seconds.
+Default: 3 (seconds)
+See also: query_local_nameservers
+
 ##### document_root
 
 Puppetdoc will create RDoc documents for your manifests if its available. This setting allows you to select the directory where you want these documents to be created.
@@ -374,6 +380,7 @@ Default: false
 
 If _true_, Foreman will query the local DNS. When _false_ Foreman will query the SOA/NS authority. Warning! Querying a resolver can cause Foreman to get false positives when checking presence of DNS records due to caching.
 Default: false
+See also: dns_conflict_timeout
 
 ##### remote_addr
 
@@ -473,15 +480,17 @@ Default: false
 ##### use_gravatar
 
 Display user avatars by matching their emails with emails at Gravatar.com
-Default: true
+Default: false
 
 ##### use_uuid_for_certificates
 
 When enabled, Foreman will generate UUIDs for each host instead of using the hostname as the Puppet certname, which is more reliable with changing hostnames.  Note that when disabling this setting, existing stored certnames won't be changed or discarded until new certificates are requested from a host (i.e. on a rebuild), in order that the existing certificate remains known to Foreman and can be revoked.
 
 ##### websockets_encrypt
 
-When enabled, virtual machine consoles using NoVNC will always be sent over an encrypted WebSocket connection.  When set to 'auto', it will be enabled if the session is using HTTPS and both websockets_ssl_key and websockets_ssl_cert are set.
+When enabled, virtual machine consoles using NoVNC will always be sent over an encrypted WebSocket connection. Requires both `websockets_ssl_cert` and `websockets_ssl_key` to be configured too.
+Default: true if `require_ssl` is enabled
+See also: websockets_ssl_cert, websockets_ssl_key
 
 ##### websockets_ssl_cert