Merge pull request #1 from SensorsIot/master

pegr69 · web-flow · commit 92face8311a9 · 2021-02-08T00:17:41.000+01:00
Merge
diff --git a/.templates/domoticz/service.yml b/.templates/domoticz/service.yml
@@ -7,8 +7,6 @@ domoticz:
     - "1443:1443"
   volumes:
     - ./volumes/domoticz/data:/config
-  env_file:
-    - ./services/domoticz/domoticz.env      
   restart: unless-stopped
   network_mode: bridge
   environment:
diff --git a/.templates/grafana/build.py b/.templates/grafana/build.py
@@ -31,7 +31,7 @@ def main():
   except:
     hideHelpText = False
 
-  documentationHint = 'https://sensorsiot.github.io/IOTstack/Containers/Adminer'
+  documentationHint = 'https://sensorsiot.github.io/IOTstack/Containers/Grafana'
 
   # This lets the menu know whether to put " >> Options " or not
   # This function is REQUIRED.
diff --git a/.templates/heimdall/heimdall.env b/.templates/heimdall/heimdall.env
diff --git a/.templates/heimdall/service.yml b/.templates/heimdall/service.yml
@@ -1,8 +1,10 @@
 heimdall:
   image: ghcr.io/linuxserver/heimdall
   container_name: heimdall
-  env_file:
-    - ./services/heimdall/heimdall.env
+  environment:
+    - PUID=1000
+    - PGID=1000
+    - TZ=Europe/Paris
   volumes:
     - ./volumes/heimdall/config:/config
   ports:
diff --git a/.templates/homer/homer.env b/.templates/homer/homer.env
diff --git a/.templates/homer/service.yml b/.templates/homer/service.yml
@@ -1,8 +1,9 @@
 homer:
   image: b4bz/homer:latest
   container_name: homer
-  env_file:
-    - ./services/homer/homer.env
+  environment:
+    - UID=1000
+    - GID=1000
   volumes:
     - ./volumes/homer/assets:/www/assets
   ports:
diff --git a/.templates/influxdb/service.yml b/.templates/influxdb/service.yml
@@ -4,8 +4,6 @@ influxdb:
   restart: unless-stopped
   ports:
     - "8086:8086"
-    - "8083:8083"
-    - "2003:2003"
   environment:
     - INFLUXDB_HTTP_FLUX_ENABLED=false
     - INFLUXDB_REPORTING_DISABLED=false
diff --git a/.templates/mosquitto/mosquitto.conf b/.templates/mosquitto/mosquitto.conf
@@ -1,12 +1,17 @@
+# required by https://mosquitto.org/documentation/migrating-to-2-0/
+listener 1883
+
 persistence true
 persistence_location /mosquitto/data/
 #log_dest file /mosquitto/log/mosquitto.log
 # To avoid flash wearing
 log_dest stdout
 
-#Uncomment to enable passwords
+# To enable passwords:
+# 1. Uncomment "password_file"; and
+# 2. Change "allow_anonymous" to "false"
 #password_file /mosquitto/pwfile/pwfile
-#allow_anonymous false
+allow_anonymous true
 
 #Uncomment to enable filters
 #acl_file /mosquitto/config/filter.acl
diff --git a/.templates/nextcloud/service.yml b/.templates/nextcloud/service.yml
@@ -23,7 +23,7 @@ nextcloud_db:
   image: linuxserver/mariadb
   container_name: nextcloud_db
   volumes:
-    - ./volumes/nextcloud/db:/var/lib/mysql
+    - ./volumes/nextcloud/db:/config
   environment:
     - MYSQL_ROOT_PASSWORD=%randomPassword%
     - MYSQL_PASSWORD=%randomMySqlPassword%
diff --git a/.templates/rtl_433/Dockerfile b/.templates/rtl_433/Dockerfile
@@ -5,6 +5,7 @@ ENV MQTT_PORT 1883
 ENV MQTT_USER ""
 ENV MQTT_PASSWORD ""
 ENV MQTT_TOPIC RTL_433
+ENV RTL_PARAMS "-C si"
 
 RUN apt-get update && apt-get install -y  git libtool libusb-1.0.0-dev librtlsdr-dev rtl-sdr cmake automake && \
 	git clone https://github.com/merbanan/rtl_433.git /tmp/rtl_433 && \
@@ -15,4 +16,4 @@ RUN apt-get update && apt-get install -y  git libtool libusb-1.0.0-dev librtlsdr
 	make && \
 	make install
 
-CMD ["sh", "-c", "rtl_433 -F mqtt://${MQTT_ADDRESS}:${MQTT_PORT},events=${MQTT_TOPIC},user=${MQTT_USER},pass=${MQTT_PASSWORD}"]
+CMD ["sh", "-c", "rtl_433 ${RTL_PARAMS} -F mqtt://${MQTT_ADDRESS}:${MQTT_PORT},events=${MQTT_TOPIC},user=${MQTT_USER},pass=${MQTT_PASSWORD}"]
diff --git a/.templates/rtl_433/service.yml b/.templates/rtl_433/service.yml
@@ -10,4 +10,6 @@ rtl_433:
     - MQTT_TOPIC=RTL_433
   devices:
     - /dev/bus/usb
+  networks:
+    - iotstack_nw
   restart: unless-stopped
diff --git a/.templates/wireguard/build.sh b/.templates/wireguard/build.sh
@@ -5,7 +5,9 @@ WG_CONF_DEST_PATH=./services/wireguard/config
 
 if [[ ! -f $WG_CONF_TEMPLATE_PATH ]]; then
     echo "[Wireguard] Warning: $WG_CONF_TEMPLATE_PATH does not exist."
-  else
-    [ -d $WG_CONF_DEST_PATH ] || mkdir -p $WG_CONF_DEST_PATH
-    cp -r $WG_CONF_TEMPLATE_PATH $WG_CONF_DEST_PATH
-fi
+else 
+    if [[ ! -d $WG_CONF_DEST_PATH ]]; then
+        mkdir -p $WG_CONF_DEST_PATH
+        cp -r $WG_CONF_TEMPLATE_PATH $WG_CONF_DEST_PATH
+    fi;
+fi
diff --git a/.templates/zigbee2mqtt/service.yml b/.templates/zigbee2mqtt/service.yml
@@ -5,5 +5,6 @@ zigbee2mqtt:
     - ./volumes/zigbee2mqtt/data:/app/data
   devices:
     - /dev/ttyAMA0:/dev/ttyACM0
+    #- /dev/ttyUSB0:/dev/ttyACM0 # Electrolama zig-a-zig-ah! (zzh!) maybe other as well
   restart: unless-stopped
   network_mode: host
diff --git a/docs/Containers/Zigbee2MQTT.md b/docs/Containers/Zigbee2MQTT.md
@@ -1,34 +1,27 @@
-# Zigbe2MQTT
+# Zigbee2MQTT
 * [Web Guide](https://www.zigbee2mqtt.io/information/docker.html)
 
 ## First startup
 
 After starting the stack check to see if there is an error due to missing device. This is because the devices are mapped differently on the Pi. If your device is not showing in the container then you can also follow the followings steps.
 
-If you get a startup failure open the docker-compose.yml file and under zigbee2mqtt change this:
+If you get a startup failure open the docker-compose.yml file and under zigbee2mqtt change device to map to container (uncomment one of alternatives):
 
 ```yml
  devices:
       - /dev/ttyAMA0:/dev/ttyACM0
       #- /dev/ttyACM0:/dev/ttyACM0
-```
-
-to 
-
-```yml
- devices:
-      #- /dev/ttyAMA0:/dev/ttyACM0
-      - /dev/ttyACM0:/dev/ttyACM0
+      #- /dev/ttyUSB0:/dev/ttyACM0 # Electrolama zig-a-zig-ah! (zzh!) maybe other as well
 ```
 
 and run docker-compose up -d again
 
-If the container starts then run `docker logs zigbe2mqtt` so see the log output and if your device is recognised. You may need to reset the device for docker to see it.
+If the container starts then run `docker logs zigbee2mqtt` so see the log output and if your device is recognised. You may need to reset the device for docker to see it.
 
 To edit the configuration file `sudo nano volumes/zigbee2mqtt/data/configuration.yaml` you many need to restart the container for changes to take affect `docker-compose restart zigbee2mqtt`
 
-Unfortunately I don't own a zigbee device and cannot offer support on the setup you will need to follow the website instructions for further instructions https://www.zigbee2mqtt.io/
+Please follow instructions on https://www.zigbee2mqtt.io/
 
 ## terminal access
 
-to access the terminal run `docker exec -it zigbee2mqtt /bin/sh` or select `/bin/sh
+To access the terminal run `docker exec -it zigbee2mqtt /bin/sh`
diff --git a/scripts/menu_main.py b/scripts/menu_main.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
-
+#!/usr/bin/python3
 from blessed import Terminal
 import sys
 import subprocess
@@ -299,6 +298,7 @@ def checkDockerVersion():
     currentDockerVersion = currentDockerVersion.decode("utf-8").rstrip().replace('"', '')
   except Exception as err:
     print("Error attempting to run docker command:", err)
+    currentDockerVersion = ""
 
   return checkVersion(requiredDockerVersion, currentDockerVersion)
 
diff --git a/scripts/python_deps_check.py b/scripts/python_deps_check.py
@@ -1,34 +1,35 @@
+#!/usr/bin/python3
 import sys
-import yaml
-import blessed
-import ruamel.yaml
 
 if sys.argv[1] == "--pyyaml-version":
   try:
+    import yaml
     print("pyyaml", yaml.__version__)
     sys.exit(0)
   except SystemExit:
     sys.exit(0)
-  except:
+  except Exception:
     print("could not get pyyaml version")
     sys.exit(3)
 
 if sys.argv[1] == "--pyaml-version":
   try:
+    import ruamel.yaml
     print("ruamel.yaml", ruamel.yaml.__version__)
     sys.exit(0)
   except SystemExit:
     sys.exit(0)
-  except:
+  except Exception:
     print("could not get ruamel.yaml version")
     sys.exit(3)
 
 if sys.argv[1] == "--blessed-version":
   try:
+    import blessed
     print("blessed", blessed.__version__)
     sys.exit(0)
   except SystemExit:
     sys.exit(0)
-  except:
+  except Exception:
     print("could not get blessed version")
     sys.exit(3)
