hassio-addons/addon-zerotier
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-zerotier.git synced 2025-05-04 19:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

🚑 Fixes secret support for network IDs

Browse source
This commit is contained in:
Franck Nijhof 2019-04-16 23:45:33 +02:00
parent d3f3174c52
commit 656a2d9dd8
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zerotier/config.json
View file

@ -39,7 +39,7 @@
"api_auth_token": ""
},
"schema": {
"networks":["match([0-9a-z]{16})"],
"networks":["match(^!secret [a-zA-Z0-9_\\-]+$|[0-9a-z]{16})"],
"api_auth_token": "str",
"log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?"
}

10
zerotier/rootfs/etc/cont-init.d/zerotier.sh
View file

@ -51,7 +51,12 @@ mkdir -p "/var/lib/zerotier-one/networks.d" \
# Install user configured/requested packages
if bashio::config.has_value 'networks'; then
for network in $(bashio::config 'networks'); do
while read -r network; do
# Get network ID from secrets, if it is a secret
if bashio::is_secret "${network}"; then
network=$(bashio::secret "${network}")
fi
bashio::log.info "Configuring network: ${network}"
# Ensure the file exists. An empty file will cause automatic join.
@ -60,5 +65,6 @@ if bashio::config.has_value 'networks'; then
"/data/network.${network}.conf" \
"/var/lib/zerotier-one/networks.d/${network}.conf" \
|| bashio::exit.nok "Could not create network file"
done
done <<< "$(bashio::config 'networks')"
fi