Merge branch 'master' of ssh://git.asperti.com:1022/paspo/hassio-addons

ot-recorder/config.json

@@ -1,7 +1,7 @@
 {
   "name": "Owntracks Recorder",
   "url": "https://git.asperti.com/paspo/hassio-addons",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "slug": "ot-recorder",
   "description": "Owntracks Recorder - connects to your mqtt broker and consumes owntracks locations",
   "startup": "before",
@@ -9,6 +9,12 @@
   "ports": {
     "8083": 8083
   },
+  "arch": [
+      "aarch64",
+      "amd64",
+      "armhf",
+      "i386"
+  ],
   "webui": "http://[HOST]:[PORT:8083]/",
   "map": ["share:rw"],
   "options": {

snmpd/config.json

@@ -9,6 +9,12 @@
   "ports": {
     "161/udp": 161
   },
+  "arch": [
+      "aarch64",
+      "amd64",
+      "armhf",
+      "i386"
+  ],
   "options": {},
   "schema": {}
 }

upsmon/config.json

@@ -4,7 +4,7 @@
   "version": "0.1.9",
   "slug": "upsmon",
   "description": "Connect to a remote NUT server",
-  "startup": "before",
+  "startup": "system",
   "boot": "auto",
   "arch": [
     "aarch64",

zabbix-agent/config.json

@@ -1,7 +1,7 @@
 {
     "name": "Zabbix Agent",
     "url": "https://git.asperti.com/paspo/hassio-addons",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "slug": "zabbix-agent",
     "description": "Zabbix Agent for hass.io",
     "startup": "services",
@@ -18,7 +18,7 @@
         "10050/tcp": 10050
     },
     "map": [
-        "config"
+        "share"
     ],
     "options": {
         "server": "zabbix-server",

zabbix-agent/run.sh

@@ -2,13 +2,13 @@
 set -e
 
 CONFIG_PATH=/data/options.json
-CUSTOM_CFG_PATH=/config/zabbix-agent
+CUSTOM_CFG_PATH=/share/zabbix-agent
 
 SERVER=$(jq --raw-output ".server" $CONFIG_PATH)
 HOSTNAME=$(jq --raw-output ".hostname" $CONFIG_PATH)
 
-if [ ! -d /data/zabbix-agent ] ; then
-  mkdir /data/zabbix-agent
+if [ ! -d "$CUSTOM_CFG_PATH" ] ; then
+  mkdir -p "$CUSTOM_CFG_PATH"
 fi
 
 echo "
@@ -16,7 +16,7 @@ Server=$SERVER
 ServerActive=$SERVER
 Hostname=$HOSTNAME
 LogType=console
-Include=/data/zabbix-agent/*.conf
+Include=${CUSTOM_CFG_PATH}/*.conf
 " > /etc/zabbix/zabbix_agentd.conf
 
 sudo -u zabbix zabbix_agentd -f