Correctly ingest key passphrase for server key
This commit is contained in:
parent
5ce094362e
commit
2991248c47
|
@ -37,6 +37,7 @@ $args = new \Qi_Console_ArgV(
|
||||||
'hostname:' => 'Set hostname of server (default localhost)',
|
'hostname:' => 'Set hostname of server (default localhost)',
|
||||||
'tls-cert:' => 'Set cert PEM file to use (default null)',
|
'tls-cert:' => 'Set cert PEM file to use (default null)',
|
||||||
'tls-key:' => 'Set private key 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',
|
'root-dir:' => 'Set the file root directory',
|
||||||
'log:' => 'Set log filename (default orbit.log)',
|
'log:' => 'Set log filename (default orbit.log)',
|
||||||
'dev' => 'Allow developer server functions (default false)',
|
'dev' => 'Allow developer server functions (default false)',
|
||||||
|
|
|
@ -73,7 +73,7 @@ class Config
|
||||||
{
|
{
|
||||||
$valid_keys = [
|
$valid_keys = [
|
||||||
'host', 'port', 'hostname', 'tls_certfile',
|
'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',
|
'root_dir', 'index_file', 'enable_directory_index',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,10 @@ class Console extends \Qi_Console_Client
|
||||||
$config->tls_keyfile = $this->_args->get("tls-key");
|
$config->tls_keyfile = $this->_args->get("tls-key");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->_args->get("tls-passphrase")) {
|
||||||
|
$config->key_passphrase = $this->_args->get("tls-passphrase");
|
||||||
|
}
|
||||||
|
|
||||||
return $config;
|
return $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue