Updated MQTT configuration information

Reviewed-on: https://git.ctmesh.org/ctmesh/web/pulls/4

index.html

@@ -340,32 +340,6 @@
           </a>
         </div>
       </div>
-      <div class="section">
-        <p class="section-title">Meshtastic</p>
-        <div class="btn-group">
-          <a href="https://meshtastic.org/" target="_blank" class="btn">
-            <img src="meshtastic.svg" alt="Meshtastic" />
-            <div class="btn-text">
-              Meshtastic
-              <small>About the project</small>
-            </div>
-          </a>
-          <a href="https://map.ctmesh.org/?lat=41.734429390721&lng=287.3501586914063&zoom=10" target="_blank" class="btn">
-            <img src="map.svg" alt="Map" />
-            <div class="btn-text">
-              Node Map
-              <small>CT Mesh nodes</small>
-            </div>
-          </a>
-          <a href="meshtastic-resources.html" class="btn">
-            <img src="info.svg" alt="Guides & Tools" />
-            <div class="btn-text">
-              Guides & Tools
-              <small>Channels, MQTT, setup</small>
-            </div>
-          </a>
-        </div>
-      </div>
       <div class="section">
         <p class="section-title">MeshCore</p>
         <div class="btn-group">
@@ -393,6 +367,32 @@
         </div>
       </div>
     </div>
+    <div class="section">
+        <p class="section-title">Meshtastic</p>
+        <div class="btn-group">
+          <a href="https://meshtastic.org/" target="_blank" class="btn">
+            <img src="meshtastic.svg" alt="Meshtastic" />
+            <div class="btn-text">
+              Meshtastic
+              <small>About the project</small>
+            </div>
+          </a>
+          <a href="https://map.ctmesh.org/?lat=41.734429390721&lng=287.3501586914063&zoom=10" target="_blank" class="btn">
+            <img src="map.svg" alt="Map" />
+            <div class="btn-text">
+              Node Map
+              <small>CT Mesh nodes</small>
+            </div>
+          </a>
+          <a href="meshtastic-resources.html" class="btn">
+            <img src="info.svg" alt="Guides & Tools" />
+            <div class="btn-text">
+              Guides & Tools
+              <small>Channels, MQTT, setup</small>
+            </div>
+          </a>
+        </div>
+      </div>
     <footer class="site-footer">
       <p><a href="https://ctmesh.org/">CT Mesh</a> is a volunteer-run user group for mesh technology enthusiasts in Connecticut.</p>
       <p><a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank" rel="noopener">Content licensed CC BY-SA 4.0</a></p>

meshcore-resources.html

@@ -216,14 +216,13 @@
     </a>
     <h1>MeshCore Resources</h1>
 
-    <h2>Community-run Web Tools</h2>
+    <h2>Web Tools</h2>
     <div class="community-tools">
-      <p><em>These tools use data reported to our MQTT server by nodes across the state.</em></p>
+      <p><em>These tools use data reported to MQTT using <a href="https://analyzer.letsmesh.net/observer/onboard" target="_blank">Observer Firmware</a> by nodes across the state.</em></p>
       <ul>
-        <li><a href="https://meshcore-map.ctmesh.org/" target="_blank">MeshCore Map</a> <strong>NEW!</strong> - live map showing MeshCore nodes</li>
+        <li><a href="https://meshcore-map.ctmesh.org/" target="_blank">MeshCore Map</a> <strong>NEW!</strong> &ndash; live map showing MeshCore nodes</li>
-        <li><a href="https://bdl.meshmapper.net/" target="_blank">MeshMapper</a> <strong>NEW!</strong> — coverage maps for MeshCore. Contribute to the map via apps coming soon!</li>
+        <li><a href="https://bdl.meshmapper.net/" target="_blank">MeshMapper</a> <strong>NEW!</strong> &ndash; coverage maps for MeshCore. Contribute via <a href="https://apps.apple.com/us/app/meshmapper/id6758073991" target="_blank">iOS</a> and <a href="https://play.google.com/store/apps/details?id=net.meshmapper.app" target="_blank">Android</a> mobile apps</li>
-        <li><a href="https://meshcore-wardrive.ctmesh.org/" target="_blank">Wardrive Map</a> - coverage maps for MeshCore. <em>Note: MeshMapper is in testing and is replacing this soon.</em></li>
+        <li><a href="https://analyzer.letsmesh.net/packets?region=BDL" target="_blank">MeshCore Analyzer</a> &ndash; real-time MeshCore network analytics, node tracking, and packet analysis</li>
-        <li><a href="https://meshcore-wardrive.ctmesh.org/wardrive" target="_blank">Wardrive Contribution</a> - upload your wardrive data to improve coverage maps</li>
       </ul>
     </div>
 
@@ -234,18 +233,26 @@
 
     <h2>MQTT</h2>
     <p>Our MQTT broker is <em>uplink-only</em> and designed for fixed nodes across the state to serve as gateway nodes. Its purpose is not to bridge gaps or extend mesh coverage, but to report local traffic to our own web-based tools for analytical data and metrics to assess the mesh's performance. <strong>This role is best suited for stable, well-placed nodes with reliable coverage.</strong></p>
-    <p>MeshCore MQTT uplink uses <a href="https://github.com/Cisien/meshcoretomqtt" target="_blank">meshcoretomqtt</a> on a Raspberry Pi or similar Linux computer with the service installed. This configuration stanza goes in your <code>.env.local</code> file after the first two MQTT servers that upload to analyzer.letsmesh.net. <strong>This also requires a custom firmware.</strong> See <a href="https://analyzer.letsmesh.net/observer/onboard" target="_blank">custom repeater firmware setup</a>.</p>
+    <p>MeshCore MQTT uplink uses <a href="https://github.com/Cisien/meshcoretomqtt" target="_blank">meshcoretomqtt</a> on a Raspberry Pi or similar Linux computer with the service installed. Configure it with a <a href="https://github.com/Cisien/meshcoretomqtt" target="_blank">Toml file</a> at <code>/etc/mctomqtt/config.d/00-user.toml</code>, with region set in your existing <code>[general]</code> section as <code>iata = "BDL"</code>, and a custom broker named <code>ctmesh</code>. The block below should be added at the end of the config file. Fill in your own broker credentials. <strong>This also requires custom firmware.</strong> See <a href="https://analyzer.letsmesh.net/observer/onboard" target="_blank">custom repeater firmware setup</a>.</p>
 
     <div class="code-block">
       <button class="copy-btn" type="button" data-copy-target="meshcore-mqtt">Copy all</button>
-      <pre id="meshcore-mqtt"># MQTT Broker 3 - CT Mesh
+      <pre id="meshcore-mqtt">[[broker]]
-MCTOMQTT_MQTT3_ENABLED=true
+name = "ctmesh"
-MCTOMQTT_MQTT3_SERVER=mqtt.ctmesh.org
+enabled = true
-MCTOMQTT_MQTT3_PORT=1883
+server = "mqtt.ctmesh.org"
-MCTOMQTT_MQTT3_USE_TLS=false
+port = 1883
-MCTOMQTT_MQTT3_USERNAME=meshdev
+transport = "tcp"
-MCTOMQTT_MQTT3_PASSWORD=large4cats</pre>
+keepalive = 60
+qos = 0
+retain = true
+
+[broker.auth]
+method = "password"
+username = "meshdev"
+password = "large4cats"</pre>
     </div>
+    <p class="note"><strong>Note:</strong> The <code>meshdev</code>/<code>large4cats</code> credentials are intentionally shared secrets for this broker. We recognize the security implications. Specific credentials to this broker can be requested.</p>
 
     <a class="btn back-link" href="index.html">Back to CT Mesh</a>
     <footer class="site-footer">

why-run-a-node.html

@@ -116,6 +116,15 @@
       background-color: #2B3A4E;
       color: #ffffff;
     }
+    .btn-discord,
+    .btn-discord:visited {
+      background-color: #5865F2;
+      color: #ffffff;
+      justify-content: center;
+    }
+    .btn-discord img {
+      filter: brightness(0) invert(1);
+    }
     .page-header {
       display: flex;
       align-items: center;
@@ -276,15 +285,19 @@
     <h1>Learn More</h1>
     <p>Start with our local guides, then review official project docs and community channels to choose the right platform for your goals.</p>
     <div class="button-row">
-      <a class="btn" href="meshcore-resources.html">MeshCore Guides & Tools</a>
+      <a class="btn btn-secondary" href="meshcore-resources.html">MeshCore Guides & Tools</a>
-      <a class="btn" href="meshtastic-resources.html">Meshtastic Guides & Tools</a>
-      <a class="btn btn-secondary" href="https://ctmesh.org/discord" target="_blank">Join CT Mesh Discord</a>
       <a class="btn btn-secondary" href="https://meshcore.co.uk/" target="_blank">Official MeshCore Site</a>
-      <a class="btn btn-secondary" href="https://meshtastic.org/" target="_blank">Official Meshtastic Site</a>
     </div>
-
+    <div class="button-row">
+      <a class="btn" href="meshtastic-resources.html">Meshtastic Guides & Tools</a>
+      <a class="btn" href="https://meshtastic.org/" target="_blank">Official Meshtastic Site</a>
+    </div>
+    <div class="button-row">
+      <a class="btn btn-discord" href="https://ctmesh.org/discord" target="_blank">Join CT Mesh Discord</a>
+    </div>
+    <div class="button-row">
       <a class="btn btn-secondary back-link" href="index.html">Back to CT Mesh</a>
-
+    </div>
     <footer class="site-footer">
       <p><a href="https://ctmesh.org/">CT Mesh</a> is a volunteer-run user group for mesh technology enthusiasts in Connecticut.</p>
       <p><a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank" rel="noopener">Content licensed CC BY-SA 4.0</a></p>