Merge branch '2.2' into develop

2018-06-20 10:26:29 +03:00
parent bc5acafa64 980caa5be5
commit 6278f27ab6
12 changed files with 212 additions and 147 deletions
--- a/maxctrl/lib/core.js
+++ b/maxctrl/lib/core.js
@ -74,6 +74,10 @@ program
        describe: 'Path to TLS public certificate',
        type: 'string'
    })
+    .option('tls-passphrase', {
+        describe: 'Password for the TLS private key',
+        type: 'string'
+    })
    .option('tls-ca-cert', {
        describe: 'Path to TLS CA certificate',
        type: 'string'