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

This commit is contained in:
Paolo Asperti 2020-06-03 22:07:48 +02:00
commit 1fdbacd82c
Signed by: paspo
GPG Key ID: 06D46905D19D5182
5 changed files with 20 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

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