Correctly ingest key passphrase for server key

This commit is contained in:
Jansen Price 2020-09-28 09:35:13 -05:00
parent 5ce094362e
commit 2991248c47
3 changed files with 6 additions and 1 deletions

View File

@ -37,6 +37,7 @@ $args = new \Qi_Console_ArgV(
'hostname:' => 'Set hostname of server (default localhost)',
'tls-cert:' => 'Set cert PEM file to use (default null)',
'tls-key:' => 'Set private key PEM file to use (default null)',
'tls-passphrase:' => 'Set passphrase for private key',
'root-dir:' => 'Set the file root directory',
'log:' => 'Set log filename (default orbit.log)',
'dev' => 'Allow developer server functions (default false)',

View File

@ -73,7 +73,7 @@ class Config
{
$valid_keys = [
'host', 'port', 'hostname', 'tls_certfile',
'tls_keyfile', 'keypassphrase', 'log_file', 'log_level',
'tls_keyfile', 'key_passphrase', 'log_file', 'log_level',
'root_dir', 'index_file', 'enable_directory_index',
];

View File

@ -102,6 +102,10 @@ class Console extends \Qi_Console_Client
$config->tls_keyfile = $this->_args->get("tls-key");
}
if ($this->_args->get("tls-passphrase")) {
$config->key_passphrase = $this->_args->get("tls-passphrase");
}
return $config;
}