From 614b4b5e439bbd552a922ecccb1cd6731b971f4d Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Tue, 17 Jan 2023 18:12:03 +0100
Subject: [PATCH] Made tls optional

---
 config/ares.dev.toml | 1 +
 config/zeus.dev.toml | 1 +
 src/config.rs        | 2 ++
 src/main.rs          | 5 ++++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/ares.dev.toml b/config/ares.dev.toml
index f3a3fca..c9342c2 100644
--- a/config/ares.dev.toml
+++ b/config/ares.dev.toml
@@ -6,6 +6,7 @@ host="olympus.vpn.huizinga.dev"
 port=8883
 username="mqtt"
 password="${MQTT_PASSWORD}"
+tls=true
 
 [ntfy]
 topic = "${NTFY_TOPIC}"
diff --git a/config/zeus.dev.toml b/config/zeus.dev.toml
index c0a93e7..d594a1a 100644
--- a/config/zeus.dev.toml
+++ b/config/zeus.dev.toml
@@ -6,6 +6,7 @@ host="olympus.lan.huizinga.dev"
 port=8883
 username="mqtt"
 password="${MQTT_PASSWORD}"
+tls=true
 
 [ntfy]
 topic = "${NTFY_TOPIC}"
diff --git a/src/config.rs b/src/config.rs
index 78b03cc..55af269 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -34,6 +34,8 @@ pub struct MqttConfig {
     pub port: u16,
     pub username: String,
     pub password: String,
+    #[serde(default)]
+    pub tls: bool
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/src/main.rs b/src/main.rs
index 3202041..9fe8db1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -64,7 +64,10 @@ async fn app() -> Result<(), Box<dyn std::error::Error>> {
     let mut mqttoptions = MqttOptions::new("rust-test", mqtt.host, mqtt.port);
     mqttoptions.set_credentials(mqtt.username, mqtt.password);
     mqttoptions.set_keep_alive(Duration::from_secs(5));
-    mqttoptions.set_transport(Transport::tls_with_default_config());
+
+    if mqtt.tls {
+        mqttoptions.set_transport(Transport::tls_with_default_config());
+    }
 
     // Create a mqtt client and wrap the eventloop
     let (client, eventloop) = AsyncClient::new(mqttoptions, 10);