buildsys: don't use rm -r on so many globs

[pve-docs.git] / datacenter.cfg.5-opts.adoc

diff --git a/datacenter.cfg.5-opts.adoc b/datacenter.cfg.5-opts.adoc
index 2ef3011695dcb5a5068282f7a2987f2237c20b41..1890a299ffe0cb0882513fc64cc7daac8c3eb25f 100644 (file)
--- a/datacenter.cfg.5-opts.adoc
+++ b/datacenter.cfg.5-opts.adoc
@@ -1,39 +1,50 @@
-`console:` `(applet | html5 | vv)` ::
+`console`: `<applet | html5 | vv>` ::
 
-Select the default Console viewer. You can either use the builtin java
-applet (VNC), an external virt-viewer comtatible application (SPICE), or an
-HTML5 based viewer (noVNC).
+Select the default Console viewer. You can either use the builtin java applet (VNC), an external virt-viewer comtatible application (SPICE), or an HTML5 based viewer (noVNC).
 
-`email_from:` `string` ::
+`email_from`: `<string>` ::
 
 Specify email address to send notification from (default is root@$hostname)
 
-`fencing:` `(both | hardware | watchdog)` (default=`watchdog`)::
+`fencing`: `<both | hardware | watchdog>` ('default =' `watchdog`)::
 
-Set the fencing mode of the HA cluster. Hardware mode needs a valid
-configuration of fence devices in /etc/pve/ha/fence.cfg. With both all two
-modes are used.  NOTE: 'hardware' and 'both' are EXPERIMENTAL & WIP
+Set the fencing mode of the HA cluster. Hardware mode needs a valid configuration of fence devices in /etc/pve/ha/fence.cfg. With both all two modes are used.
++
+WARNING: 'hardware' and 'both' are EXPERIMENTAL & WIP
 
-`http_proxy:` `http://.*` ::
+`http_proxy`: `http://.*` ::
 
-Specify external http proxy which is used for downloads (example:
-'http://username:password@host:port/')
+Specify external http proxy which is used for downloads (example: 'http://username:password@host:port/')
 
-`keyboard:` `(da | de | de-ch | en-gb | en-us | es | fi | fr | fr-be | fr-ca | fr-ch | hu | is | it | ja | lt | mk | nl | no | pl | pt | pt-br | sl | sv | tr)` ::
+`keyboard`: `<da | de | de-ch | en-gb | en-us | es | fi | fr | fr-be | fr-ca | fr-ch | hu | is | it | ja | lt | mk | nl | no | pl | pt | pt-br | sl | sv | tr>` ::
 
 Default keybord layout for vnc server.
 
-`language:` `(de | en)` ::
+`language`: `<de | en>` ::
 
 Default GUI language.
 
-`max_workers:` `integer (1 - N)` ::
+`mac_prefix`: `(?^i:[a-f0-9]{2}(?::[a-f0-9]{2}){0,2}:?)` ::
 
-Defines how many workers (per node) are maximal started  on actions like
-'stopall VMs' or task from the ha-manager.
+Prefix for autogenerated MAC addresses.
 
-`migration_unsecure:` `boolean` ::
+`max_workers`: `<integer> (1 - N)` ::
 
-Migration is secure using SSH tunnel by default. For secure private
-networks you can disable it to speed up migration.
+Defines how many workers (per node) are maximal started  on actions like 'stopall VMs' or task from the ha-manager.
+
+`migration`: `[type=]<secure|insecure> [,network=<CIDR>]` ::
+
+For cluster wide migration settings.
+
+`network`=`<CIDR>` ;;
+
+CIDR of the (sub) network that is used for migration.
+
+`type`=`<insecure | secure>` ('default =' `secure`);;
+
+Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.
+
+`migration_unsecure`: `<boolean>` ::
+
+Migration is secure using SSH tunnel by default. For secure private networks you can disable it to speed up migration. Deprecated, use the 'migration' property instead!