Compare commits

...

21 Commits

12 changed files with 206 additions and 157 deletions

View File

@@ -1,8 +1,8 @@
---
repository:
description: "ZeroTier One - Community Hass.io Add-on for Home Assistant"
description: "ZeroTier One - Home Assistant Community Add-ons"
homepage: https://addons.community
topics: zerotier, vpn, peer-to-peer, networking, hassio-addons, hassio, hass, home-assistant, homeassistant
topics: zerotier, vpn, peer-to-peer, networking, addon, addons, home-assistant, homeassistant
private: false
has_issues: true
has_projects: false

2
.github/support.yml vendored
View File

@@ -12,7 +12,7 @@ supportComment: >
support channels to get help with the project.
Head over to the
[Home Assistant community forum](https://community.home-assistant.io/?u=frenck)
[Home Assistant community forum](https://community.home-assistant.io/t/home-assistant-community-add-on-zerotier-one/109091?u=frenck)
or join our [Discord](https://discord.me/hassioaddons) chat.
# Close issues marked as support requests

View File

@@ -5,10 +5,9 @@ variables:
ADDON_GITHUB_REPO: "hassio-addons/addon-zerotier"
ADDON_SLUG: "zerotier"
ADDON_TARGET: "zerotier"
ADDON_LEGACY_TAGS: "true"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:6.0.1"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:6.0.1"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:6.0.1"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:6.0.1"
ADDON_I386_BASE: "hassioaddons/base-i386:6.0.1"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:8.0.5"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:8.0.5"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:8.0.5"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:8.0.5"
ADDON_I386_BASE: "hassioaddons/base-i386:8.0.5"

104
README.md
View File

@@ -1,4 +1,4 @@
# Community Hass.io Add-ons: ZeroTier One
# Home Assistant Community Add-on: ZeroTier One
[![GitHub Release][releases-shield]][releases]
![Project Stage][project-stage-shield]
@@ -35,88 +35,7 @@ embedded devices, cloud resources, and apps any way they want anywhere they go.
It transforms the entire world into a single data center, to which you
can now add your Home Assistant instance using this add-on.
## Installation
The installation of this add-on is pretty straightforward and not different in
comparison to installing any other Hass.io add-on.
1. Search for the "ZeroTier One" add-on in the Hass.io add-on store
and install it.
1. Create a free account at [zerotier.com][zerotier] and get a network ID.
1. Set the "network_id" add-on option with your network ID.
1. Start the "ZeroTier One" add-on
1. Check the logs of the "ZeroTier One" add-on to see if everything went well.
1. The instance will show up in your ZeroTier account.
## Configuration
**Note**: _Remember to restart the add-on when the configuration is changed._
Example add-on configuration:
```json
{
"networks":[
"wgfyiwe73747457",
"fhu3888892jjfdk"
],
"api_auth_token":""
}
```
**Note**: _This is just an example, don't copy and paste it! Create your own!_
### Option: `log_level`
The `log_level` option controls the level of log output by the addon and can
be changed to be more or less verbose, which might be useful when you are
dealing with an unknown issue. Possible values are:
- `trace`: Show every detail, like all called internal functions.
- `debug`: Shows detailed debug information.
- `info`: Normal (usually) interesting events.
- `warning`: Exceptional occurrences that are not errors.
- `error`: Runtime errors that do not require immediate action.
- `fatal`: Something went terribly wrong. Add-on becomes unusable.
Please note that each level automatically includes log messages from a
more severe level, e.g., `debug` also shows `info` messages. By default,
the `log_level` is set to `info`, which is the recommended setting unless
you are troubleshooting.
### Option: `networks`
Configures one or more network identifiers of the networks (VLAN) to join.
You can find this number in your ZeroTier account.
**Note**: _This option support secrets, e.g., `!secret zerotier_network_id`._
### Option: `api_auth_token`
ZeroTier exposes a local HTTP JSON API, which uses the port set using the
`port` option above. It allows tools and programs to access this ZeroTier
instance for quering data (or control it).
This token is like a password for accessing that API, you can leave this
option empty if you are not planning on using this feature.
For more information on the ZeroTier JSON API, [check their documentation][api].
**Note**: _This option support secrets, e.g., `!secret zerotier_token`._
## Changelog & Releases
This repository keeps a change log using [GitHub's releases][releases]
functionality. The format of the log is based on
[Keep a Changelog][keepchangelog].
Releases are based on [Semantic Versioning][semver], and use the format
of ``MAJOR.MINOR.PATCH``. In a nutshell, the version will be incremented
based on the following:
- ``MAJOR``: Incompatible or major changes.
- ``MINOR``: Backwards-compatible new features and enhancements.
- ``PATCH``: Backwards-compatible bugfixes and package updates.
[:books: Read the full add-on documentation][docs]
## Support
@@ -124,7 +43,7 @@ Got questions?
You have several options to get them answered:
- The [Community Hass.io Add-ons Discord chat server][discord] for add-on
- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on
support and feature requests.
- The [Home Assistant Discord chat server][discord-ha] for general Home
Assistant discussions and questions.
@@ -150,11 +69,11 @@ The original setup of this repository is by [Franck Nijhof][frenck].
For a full list of all authors and contributors,
check [the contributor's page][contributors].
## We have got some Hass.io add-ons for you
## We have got some Home Assistant add-ons for you
Want some more functionality to your Hass.io Home Assistant instance?
Want some more functionality to your Home Assistant instance?
We have created multiple add-ons for Hass.io. For a full list, check out
We have created multiple add-ons for Home Assistant. For a full list, check out
our [GitHub Repository][repository].
## License
@@ -183,7 +102,6 @@ SOFTWARE.
[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
[api]: https://www.zerotier.com/manual.shtml#4_1
[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
[commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-zerotier.svg
@@ -192,26 +110,22 @@ SOFTWARE.
[discord-ha]: https://discord.gg/c5DvZ4e
[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
[discord]: https://discord.me/hassioaddons
[dockerhub]: https://hub.docker.com/r/hassioaddons/zerotier
[docs]: https://github.com/hassio-addons/addon-zerotier/blob/master/zerotier/DOCS.md
[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
[forum]: https://community.home-assistant.io/?u=frenck
[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-zerotier-one/109091?u=frenck
[frenck]: https://github.com/frenck
[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
[github-sponsors]: https://github.com/sponsors/frenck
[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-zerotier/badges/master/pipeline.svg
[gitlabci]: https://gitlab.com/hassio-addons/addon-zerotier/pipelines
[home-assistant]: https://home-assistant.io
[i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
[issue]: https://github.com/hassio-addons/addon-zerotier/issues
[keepchangelog]: http://keepachangelog.com/en/1.0.0/
[license-shield]: https://img.shields.io/github/license/hassio-addons/addon-zerotier.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
[patreon]: https://www.patreon.com/
[patreon]: https://www.patreon.com/frenck
[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
[reddit]: https://reddit.com/r/homeassistant
[releases-shield]: https://img.shields.io/github/release/hassio-addons/addon-zerotier.svg
[releases]: https://github.com/hassio-addons/addon-zerotier/releases
[repository]: https://github.com/hassio-addons/repository
[semver]: http://semver.org/spec/v2.0.0.htm
[zerotier]: https://www.zerotier.com/

View File

@@ -1,4 +1,4 @@
# Community Hass.io Add-ons: ZeroTier One
# Home Assistant Community Add-on: ZeroTier One
[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
@@ -22,13 +22,11 @@ embedded devices, cloud resources, and apps any way they want anywhere they go.
It transforms the entire world into a single data center, to which you
can now add your Home Assistant instance using this add-on.
[Click here for the full documentation][docs]
{% if channel == "edge" %}
## WARNING! THIS IS AN EDGE VERSION!
This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
add-ons are based upon the latest development version.
This Home Assistant Add-ons repository contains edge builds of add-ons.
Edge builds add-ons are based upon the latest development version.
- They may not work at all.
- They might stop working at any time.
@@ -48,7 +46,7 @@ If you are more interested in stable releases of our add-ons:
{% if channel == "beta" %}
## WARNING! THIS IS A BETA VERSION!
This Hass.io Add-ons repository contains beta releases of add-ons.
This Home Assistant Add-ons repository contains beta releases of add-ons.
- They might stop working at any time.
- They could have a negative impact on your system.
@@ -65,9 +63,8 @@ If you are more interested in stable releases of our add-ons:
{% endif %}
[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
[discord]: https://discord.me/hassioaddons
[docs]: {{ repo }}/blob/{{ version }}/README.md
[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
[forum]: https://community.home-assistant.io/?u=frenck
[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-zerotier-one/109091?u=frenck
[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
[github-sponsors]: https://github.com/sponsors/frenck
[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg

149
zerotier/DOCS.md Normal file
View File

@@ -0,0 +1,149 @@
# Home Assistant Community Add-on: ZeroTier One
ZeroTier delivers the capabilities of VPNs, SDN, and SD-WAN with a single
system. Manage all your connected resources across both local and wide area
networks as if the whole world is a single data center.
People use ZeroTier to seamlessly connect laptops, desktops, phones,
embedded devices, cloud resources, and apps any way they want anywhere they go.
It transforms the entire world into a single data center, to which you
can now add your Home Assistant instance using this add-on.
## Installation
The installation of this add-on is pretty straightforward and not different in
comparison to installing any other Home Assistant add-on.
1. Search for the "ZeroTier One" add-on in the Supervisor add-on store
and install it.
1. Create a free account at [zerotier.com][zerotier] and get a network ID.
1. Set the "network_id" add-on option with your network ID.
1. Start the "ZeroTier One" add-on
1. Check the logs of the "ZeroTier One" add-on to see if everything went well.
1. The instance will show up in your ZeroTier account.
## Configuration
**Note**: _Remember to restart the add-on when the configuration is changed._
Example add-on configuration:
```yaml
networks:
- wgfyiwe73747457
- fhu3888892jjfdk
api_auth_token: ''
```
**Note**: _This is just an example, don't copy and paste it! Create your own!_
### Option: `log_level`
The `log_level` option controls the level of log output by the addon and can
be changed to be more or less verbose, which might be useful when you are
dealing with an unknown issue. Possible values are:
- `trace`: Show every detail, like all called internal functions.
- `debug`: Shows detailed debug information.
- `info`: Normal (usually) interesting events.
- `warning`: Exceptional occurrences that are not errors.
- `error`: Runtime errors that do not require immediate action.
- `fatal`: Something went terribly wrong. Add-on becomes unusable.
Please note that each level automatically includes log messages from a
more severe level, e.g., `debug` also shows `info` messages. By default,
the `log_level` is set to `info`, which is the recommended setting unless
you are troubleshooting.
### Option: `networks`
Configures one or more network identifiers of the networks (VLAN) to join.
You can find this number in your ZeroTier account.
**Note**: _This option support secrets, e.g., `!secret zerotier_network_id`._
### Option: `api_auth_token`
ZeroTier exposes a local HTTP JSON API, which uses the port set using the
`port` option above. It allows tools and programs to access this ZeroTier
instance for quering data (or control it).
This token is like a password for accessing that API, you can leave this
option empty if you are not planning on using this feature.
For more information on the ZeroTier JSON API, [check their documentation][api].
**Note**: _This option support secrets, e.g., `!secret zerotier_token`._
## Changelog & Releases
This repository keeps a change log using [GitHub's releases][releases]
functionality. The format of the log is based on
[Keep a Changelog][keepchangelog].
Releases are based on [Semantic Versioning][semver], and use the format
of ``MAJOR.MINOR.PATCH``. In a nutshell, the version will be incremented
based on the following:
- ``MAJOR``: Incompatible or major changes.
- ``MINOR``: Backwards-compatible new features and enhancements.
- ``PATCH``: Backwards-compatible bugfixes and package updates.
## Support
Got questions?
You have several options to get them answered:
- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on
support and feature requests.
- The [Home Assistant Discord chat server][discord-ha] for general Home
Assistant discussions and questions.
- The Home Assistant [Community Forum][forum].
- Join the [Reddit subreddit][reddit] in [/r/homeassistant][reddit]
You could also [open an issue here][issue] GitHub.
## Authors & contributors
The original setup of this repository is by [Franck Nijhof][frenck].
For a full list of all authors and contributors,
check [the contributor's page][contributors].
## License
MIT License
Copyright (c) 2019-2020 Franck Nijhof
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
[api]: https://www.zerotier.com/manual.shtml#4_1
[contributors]: https://github.com/hassio-addons/addon-zerotier/graphs/contributors
[discord-ha]: https://discord.gg/c5DvZ4e
[discord]: https://discord.me/hassioaddons
[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-zerotier-one/109091?u=frenck
[frenck]: https://github.com/frenck
[issue]: https://github.com/hassio-addons/addon-zerotier/issues
[keepchangelog]: http://keepachangelog.com/en/1.0.0/
[reddit]: https://reddit.com/r/homeassistant
[releases]: https://github.com/hassio-addons/addon-zerotier/releases
[semver]: http://semver.org/spec/v2.0.0.htm
[zerotier]: https://www.zerotier.com/

View File

@@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:6.0.1
ARG BUILD_FROM=hassioaddons/base:8.0.5
# hadolint ignore=DL3006
FROM ${BUILD_FROM}
@@ -12,13 +12,13 @@ COPY rootfs/patches /patches
# hadolint ignore=DL3003
RUN \
apk add --no-cache --virtual .build-dependencies \
build-base=0.5-r1 \
linux-headers=4.19.36-r0 \
git=2.24.1-r0 \
build-base=0.5-r2 \
linux-headers=5.4.5-r1 \
git=2.26.2-r0 \
\
&& apk add --no-cache \
libgcc=9.2.0-r3 \
libstdc++=9.2.0-r3 \
libgcc=9.3.0-r2 \
libstdc++=9.3.0-r2 \
\
&& git clone --branch "1.4.6" --depth=1 \
"https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
@@ -28,8 +28,8 @@ RUN \
&& make \
&& make install \
\
&& rm -f -r /tmp/* \
&& apk del --purge .build-dependencies
&& apk del --no-cache --purge .build-dependencies \
&& rm -f -r /tmp/*
# Copy root filesystem
COPY rootfs /
@@ -48,12 +48,14 @@ LABEL \
io.hass.type="addon" \
io.hass.version=${BUILD_VERSION} \
maintainer="Franck Nijhof <frenck@addons.community>" \
org.label-schema.description="Radically simplify your network with a virtual networking layer that works the same everywhere" \
org.label-schema.build-date=${BUILD_DATE} \
org.label-schema.name="ZeroTier One" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://community.home-assistant.io/?u=frenck" \
org.label-schema.usage="https://github.com/hassio-addons/addon-zerotier/tree/master/README.md" \
org.label-schema.vcs-ref=${BUILD_REF} \
org.label-schema.vcs-url="https://github.com/hassio-addons/addon-zerotier" \
org.label-schema.vendor="Community Hass.io Add-ons"
org.opencontainers.image.title="ZeroTier One" \
org.opencontainers.image.description="Radically simplify your network with a virtual networking layer that works the same everywhere" \
org.opencontainers.image.vendor="Home Assistant Community Add-ons" \
org.opencontainers.image.authors="Franck Nijhof <frenck@addons.community>" \
org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.url="https://addons.community" \
org.opencontainers.image.source="https://github.com/hassio-addons/addon-zerotier" \
org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-zerotier/blob/master/README.md" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.revision=${BUILD_REF} \
org.opencontainers.image.version=${BUILD_VERSION}

View File

@@ -1,10 +1,10 @@
{
"build_from": {
"aarch64": "hassioaddons/base-aarch64:6.0.1",
"amd64": "hassioaddons/base-amd64:6.0.1",
"armhf": "hassioaddons/base-armhf:6.0.1",
"armv7": "hassioaddons/base-armv7:6.0.1",
"i386": "hassioaddons/base-i386:6.0.1"
"aarch64": "hassioaddons/base-aarch64:8.0.5",
"amd64": "hassioaddons/base-amd64:8.0.5",
"armhf": "hassioaddons/base-armhf:8.0.5",
"armv7": "hassioaddons/base-armv7:8.0.5",
"i386": "hassioaddons/base-i386:8.0.5"
},
"args": {}
}

View File

@@ -5,13 +5,8 @@
"description": "Radically simplify your network with a virtual networking layer that works the same everywhere",
"url": "https://github.com/hassio-addons/addon-zerotier",
"startup": "services",
"arch": [
"aarch64",
"amd64",
"armhf",
"armv7",
"i386"
],
"init": false,
"arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
"ports": {
"9993/tcp": 9993
},
@@ -23,23 +18,16 @@
"hassio_role": "default",
"homeassistant_api": false,
"host_network": true,
"privileged": [
"NET_ADMIN",
"SYS_ADMIN"
],
"devices": [
"/dev/net/tun:/dev/net/tun:rwm"
],
"map": [
"ssl:rw"
],
"privileged": ["NET_ADMIN", "SYS_ADMIN"],
"devices": ["/dev/net/tun:/dev/net/tun:rwm"],
"map": ["ssl:rw"],
"options": {
"networks":[],
"networks": [],
"api_auth_token": ""
},
"schema": {
"networks":["match(^!secret [a-zA-Z0-9_\\-]+$|[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)$)?"
"log_level": "list(trace|debug|info|notice|warning|error|fatal)?"
}
}

View File

@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# Community Hass.io Add-ons: ZeroTier One
# Home Assistant Community Add-on: ZeroTier One
# Generates an identiy in case it does not exists yet
# ==============================================================================
readonly private='/ssl/zerotier/identity.secret'

View File

@@ -1,6 +1,6 @@
#!/usr/bin/execlineb -S0
# ==============================================================================
# Community Hass.io Add-ons: ZeroTier One
# Home Assistant Community Add-on: ZeroTier One
# Take down the S6 supervision tree when ZeroTier fails
# ==============================================================================
if -n { s6-test $# -ne 0 }

View File

@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# Community Hass.io Add-ons: ZeroTier One
# Home Assistant Community Add-on: ZeroTier One
# Runs ZeroTier One
# ==============================================================================
declare -a options