Merge pull request #384 from WildernessLabs/feature/mqtt-tls

Update MQTT settings to TLS by default
WildernessLabs · Oct 24, 2023 · 4122f1c · 4122f1c
2 parents fa6cdc7 + 6165dd2
commit 4122f1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/source/Meadow.Core/Configuration/MeadowUpdateSettings.cs b/source/Meadow.Core/Configuration/MeadowUpdateSettings.cs
@@ -5,8 +5,8 @@ namespace Meadow;
 internal class MeadowUpdateSettings : IUpdateSettings
 {
     public bool Enabled { get; set; } = false;
-    public string UpdateServer { get; set; } = "mqtt-01.meadowcloud.co";
-    public int UpdatePort { get; set; } = 1883;
+    public string UpdateServer { get; set; } = "mqtt.meadowcloud.co";
+    public int UpdatePort { get; set; } = 8883;
     public string Organization { get; set; } = "Default organization";
     public string RootTopic { get; set; } = "{OID}/ota/{ID};{OID}/commands/{ID}";
     public int CloudConnectRetrySeconds { get; set; } = 15;

diff --git a/source/Meadow.Core/Update/UpdateService.cs b/source/Meadow.Core/Update/UpdateService.cs
@@ -277,6 +277,10 @@ private async void UpdateStateMachine()
                         Resolver.Log.Debug("Creating MQTT client options");
                         var builder = new MqttClientOptionsBuilder()
                             .WithTcpServer(Config.UpdateServer, Config.UpdatePort)
+                            .WithTls(tlsParameters =>
+                            {
+                                tlsParameters.UseTls = Config.UpdatePort == 8883;
+                            })
                             .WithProtocolVersion(MQTTnet.Formatter.MqttProtocolVersion.V500)
                             .WithCommunicationTimeout(TimeSpan.FromSeconds(30));