Skip to content

Commit

Permalink
Make "legacy" Kibana server aware of connection protocol. (elastic#20756
Browse files Browse the repository at this point in the history
)
  • Loading branch information
azasypkin authored and Aliaksandr Yankouski committed Jul 16, 2018
1 parent ec491c6 commit 7b969b3
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/server/http/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,17 @@ export default async function (kbnServer, server, config) {

// Note that all connection options configured here should be exactly the same
// as in `getServerOptions()` in the new platform (see `src/core/server/http/http_tools`).
//
// The only exception is `tls` property: TLS is entirely handled by the new
// platform and we don't have to duplicate all TLS related settings here, we just need
// to indicate to Hapi connection that TLS is used so that it can use correct protocol
// name in `server.info` and `request.connection.info` that are used throughout Kibana.
//
// Any change SHOULD BE applied in both places.
server.connection({
host: config.get('server.host'),
port: config.get('server.port'),
tls: config.get('server.ssl.enabled'),
listener: kbnServer.newPlatform.proxyListener,
state: {
strictHeader: false,
Expand Down

0 comments on commit 7b969b3

Please sign in to comment.