From 54e5db7584894a093d1d6e368b1c655c5945fabb Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 8 Apr 2021 09:32:31 -0700 Subject: [PATCH 1/2] Use SSL by default for MQTT --- adafruit_funhouse/network.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/adafruit_funhouse/network.py b/adafruit_funhouse/network.py index 17d9885..b790c5f 100755 --- a/adafruit_funhouse/network.py +++ b/adafruit_funhouse/network.py @@ -77,10 +77,19 @@ def init_io_mqtt(self): "Adafruit IO secrets are kept in secrets.py, please add them there!\n\n" ) from KeyError - return self.init_mqtt(IO_MQTT_BROKER, 1883, aio_username, aio_key, True) + return self.init_mqtt( + IO_MQTT_BROKER, MQTT.MQTT_TLS_PORT, aio_username, aio_key, True + ) # pylint: disable=too-many-arguments - def init_mqtt(self, broker, port=1883, username=None, password=None, use_io=False): + def init_mqtt( + self, + broker, + port=MQTT.MQTT_TLS_PORT, + username=None, + password=None, + use_io=False, + ): """Initialize MQTT""" self.connect() self._mqtt_client = MQTT.MQTT( From 00b44fa71ef0bb3208b446cc83bd7b7c43c3b6d0 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Thu, 8 Apr 2021 09:43:49 -0700 Subject: [PATCH 2/2] Use numerical port --- adafruit_funhouse/network.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/adafruit_funhouse/network.py b/adafruit_funhouse/network.py index b790c5f..1317eec 100755 --- a/adafruit_funhouse/network.py +++ b/adafruit_funhouse/network.py @@ -77,15 +77,13 @@ def init_io_mqtt(self): "Adafruit IO secrets are kept in secrets.py, please add them there!\n\n" ) from KeyError - return self.init_mqtt( - IO_MQTT_BROKER, MQTT.MQTT_TLS_PORT, aio_username, aio_key, True - ) + return self.init_mqtt(IO_MQTT_BROKER, 8883, aio_username, aio_key, True) # pylint: disable=too-many-arguments def init_mqtt( self, broker, - port=MQTT.MQTT_TLS_PORT, + port=8883, username=None, password=None, use_io=False,