Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise

This commit is contained in:
Michal Kit
2018-05-02 17:32:01 +01:00
51 changed files with 662 additions and 79 deletions

View File

@ -24,6 +24,7 @@ import java.nio.file.Path
class WebServerConfig(override val baseDirectory: Path, val config: Config) : NodeSSLConfiguration {
override val keyStorePassword: String by config
override val trustStorePassword: String by config
override val crlCheckSoftFail: Boolean by config
val useHTTPS: Boolean by config
val myLegalName: String by config
val rpcAddress: NetworkHostAndPort by lazy {