Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-05-16 11:46:45 +03:00
10 changed files with 183 additions and 365 deletions

View File

@ -1564,7 +1564,7 @@ Passwords stored in the maxscale.cnf file may optionally be encrypted for added
This is done by creation of an encryption key on installation of MariaDB MaxScale.
Encryption keys may be created manually by executing the maxkeys utility with the argument
of the filename to store the key. The default location MariaDB MaxScale stores
the keys is `/var/lib/maxscale`.
the keys is `/var/lib/maxscale`. The passwords are encrypted using 256-bit AES CBC encryption.
```
# Usage: maxkeys [PATH]