opendev
/
puppet-mosquitto
Code Issues Proposed changes

Make websocket tls independent 

Currently there is no way to independtly disable the encrypted
websockets connection from the mqtt tls listener. This commit switches
this to be the new enable_websocket_tls flag which will be used to
independtly control whether we deploy an encypted websockets port.

Change-Id: I2bb806210dbe5c40cfda5ac205f3659c2085f0e1
This commit is contained in:
Matthew Treinish 2018-02-26 05:50:23 -05:00
parent 6ecbac2e86
commit d641406a28
No known key found for this signature in database
GPG Key ID: FD12A0F214C9E177
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/server.pp
View File

@ -22,6 +22,7 @@ class mosquitto::server (
$infra_service_username = 'infra',
$websocket_port = 80,
$enable_tls = false,
$enable_tls_websocket = false,
$websocket_tls_port = 8080,
$ca_file = undef,
$cert_file = undef,

2
templates/mosquitto.conf.erb
View File

@ -293,7 +293,7 @@ listener <%= @websocket_port %>
protocol websockets
# Encrypted http websocket port
<% if @enable_tls -%>
<% if @enable_websocket_tls -%>
listener <%= @websocket_tls_port %>
cafile /etc/mosquitto/ca.crt
certfile /etc/mosquitto/server.crt