updated mqtt broker to lifo

HomeSmartMesh · Sep 12, 2021 · ba6c605 · ba6c605
1 parent 665826f
commit ba6c605
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 32 deletions.
diff --git a/containers/zigbee2mqtt/data/configuration.yaml b/containers/zigbee2mqtt/data/configuration.yaml
@@ -2,7 +2,7 @@ homeassistant: true
 permit_join: false
 mqtt:
   base_topic: lzig
-  server: 'mqtt://10.0.0.42'
+  server: 'mqtt://localhost'
 serial:
   port: /dev/ttyUSB1
 advanced:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -92,7 +92,7 @@ services:
   zigAssLifo:
       image: carldebilly/zigbee2mqttassistant
       environment:
-          - Z2MA_SETTINGS__MQTTSERVER=10.0.0.42
+          - Z2MA_SETTINGS__MQTTSERVER=10.0.0.31
           - Z2MA_SETTINGS__BASETOPIC=lzig
           - TZ=Europe/Berlin
       ports:

diff --git a/hosts b/hosts
@@ -1,4 +1,4 @@
-10.0.0.42   mqtt_broquer
+10.0.0.31   mqtt_broquer
 10.0.0.5    cutain_sun.lifx
 10.0.0.3    salon
 10.0.0.13   strong.shelly

diff --git a/js/camera_lapse/config.json b/js/camera_lapse/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"camera_client",

diff --git a/js/graphql/resolvers/index.js b/js/graphql/resolvers/index.js
@@ -5,7 +5,7 @@ function defined(obj){
     return (typeof(obj) != "undefined")
 }
 
-const client = connect('mqtt://10.0.0.42:1883', {
+const client = connect('mqtt://mqtt_broquer:1883', {
     reconnectPeriod: 1000
 });
 

diff --git a/js/lifx/config.json b/js/lifx/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"lifx_client",
@@ -15,7 +15,7 @@
         "sim":"lifx/sim_tiles",
         "curtain sun":{
             "mac": "D0:73:D5:40:98:88",
-            "ip": "10.0.0.5"
+            "ip": "cutain_sun.lifx"
         }
     },
     "log":{

diff --git a/js/telegraf/config.json b/js/telegraf/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"telegraf_bots_client",

diff --git a/js/watch_bots/config.json b/js/watch_bots/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"watch_bots",
@@ -64,7 +64,7 @@
         "nrf":1
     },
     "log":{
-        "logfile":"/home/pi/share/watch_bots (date).log",
+        "logfile":"/home/pi/share/watch_bots(date).log",
         "level":"info"
     }
 }
diff --git a/js/watch_bots/readme.md b/js/watch_bots/readme.md
@@ -32,7 +32,7 @@ The idea is to configure as many sensors with as less declaration redunduncy as
 ```json
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"watch_bots",

diff --git a/py/bathroom/config.json b/py/bathroom/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"localhost",
         "port":1883,
         "keepalive":60,
         "client_id":"bath_client",

diff --git a/py/heating/config.json b/py/heating/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"heat_client",

diff --git a/py/heating/config_WassDell.json b/py/heating/config_WassDell.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"heat_client",

diff --git a/py/heating/heat.py b/py/heating/heat.py
diff --git a/py/home_status/config.json b/py/home_status/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"home_status_client",

diff --git a/py/home_status/home.py b/py/home_status/home.py
diff --git a/py/hover/config.json b/py/hover/config.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"hover_control",

diff --git a/py/hover/config_WassDell.json b/py/hover/config_WassDell.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"hover_control",

diff --git a/py/hover/config_mano.json b/py/hover/config_mano.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"hover_control",

diff --git a/py/hue/config.json b/py/hue/config.json
@@ -1,10 +1,10 @@
 {  
     "bridges":{
-        "LivingRoom":"10.0.0.38",
+        "LivingRoom":"hue",
         "username_config":"/home/pi/.python_hue"
     },
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"hue_client",

diff --git a/py/hue/config_WassDell.json b/py/hue/config_WassDell.json
@@ -1,6 +1,6 @@
 {  
     "bridges":{
-        "LivingRoom":"10.0.0.38"
+        "LivingRoom":"hue"
     },
     "rules":{
         "wakeup":{
@@ -10,7 +10,7 @@
         }
     },
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"hue_client",

diff --git a/py/leds_panel/config_WassDell.json b/py/leds_panel/config_WassDell.json
@@ -1,6 +1,6 @@
 {
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"leds_panel",

diff --git a/py/nrf_mesh/config_WassDell.json b/py/nrf_mesh/config_WassDell.json
@@ -16,7 +16,7 @@
         "last_seen":true,
         "retain":true,
         "qos":1,
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"nrf_mesh",

diff --git a/py/thread_tags/config_metal.json b/py/thread_tags/config_metal.json
@@ -1,6 +1,6 @@
 {  
     "mqtt":{
-        "host":"10.0.0.42",
+        "host":"10.0.0.31",
         "port":1883,
         "keepalive":60,
         "client_id":"thread_tags",

diff --git a/web/bed_heating/src/mqtt_app.js b/web/bed_heating/src/mqtt_app.js
@@ -2,7 +2,7 @@
 
 var client,textBox;
 
-var mqtt_host = "10.0.0.42";
+var mqtt_host = "mqtt_broquer";
 var mqtt_port = 1884;
 
 var btn_on = document.getElementById("btn_on");

diff --git a/web/heating/src/mqtt_app.js b/web/heating/src/mqtt_app.js
@@ -2,7 +2,7 @@
 
 var client,textBox;
 
-var mqtt_host = "10.0.0.42";
+var mqtt_host = "mqtt_broquer";
 var mqtt_port = 1884;
 
 var btn_cosy = document.getElementById("btn_cosy");

diff --git a/web/leds_panel/src/mqtt_app.js b/web/leds_panel/src/mqtt_app.js
@@ -2,7 +2,7 @@
 
 var client,textBox;
 
-var mqtt_host = "10.0.0.42";
+var mqtt_host = "mqtt_broquer";
 var mqtt_port = 1884;
 var durationEdit = document.getElementById("inDuration");
 var colorPicker = document.getElementById("inColor");

diff --git a/web/mesh_view/src/mqtt_app.js b/web/mesh_view/src/mqtt_app.js
@@ -30,7 +30,7 @@ function onMqttSendRequest(e){
 
 function init(){
   // Create a client instance
-  client = new Paho.MQTT.Client("10.0.0.42", Number(mqtt_port), "clientId");
+  client = new Paho.MQTT.Client("10.0.0.31", Number(mqtt_port), "clientId");
   // set callback handlers
   client.onConnectionLost = onConnectionLost;
   client.onMessageArrived = onMessageArrived;

diff --git a/web/zigbee_graph_view/index.html b/web/zigbee_graph_view/index.html
@@ -31,7 +31,7 @@
   <!-- ---------------------------- Control buttons --------------------------------------------- -->
 
   <div class="btn-group" role="group" aria-label="Basic example"  style="margin:10px" >
-    <input type="text" id="host_ip" value="10.0.0.42" placeholder="host...">
+    <input type="text" id="host_ip" value="10.0.0.31" placeholder="host...">
     <input type="text" id="host_port" value="1884" placeholder="port...">
     <button id="btn_engine_dot"  class="btn btn-danger" type="button">dot</button>
     <button id="btn_engine_circo"  class="btn btn-danger" type="button">circo</button>

diff --git a/zigbee/py_to_dot/config.json b/zigbee/py_to_dot/config.json
@@ -11,7 +11,7 @@
         "subscribe" :false,
         "publish" :true,
         "base_topic" : "nrf",
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"nrf_mesh",

diff --git a/zigbee/py_to_dot/config_WassDell.json b/zigbee/py_to_dot/config_WassDell.json
@@ -4,7 +4,7 @@
         "subscribe" :true,
         "publish" :true,
         "base_topic" : "nrf",
-        "host":"10.0.0.42",
+        "host":"mqtt_broquer",
         "port":1883,
         "keepalive":60,
         "client_id":"nrf_mesh",