Compare commits

...

16 Commits

15 changed files with 99 additions and 94 deletions

3
.github/FUNDING.yml vendored
View File

@@ -1,5 +1,4 @@
---
# github: frenck
github: frenck
patreon: frenck
ko_fi: frenck
custom: https://frenck.dev/donate/

6
.github/config.yml vendored
View File

@@ -34,14 +34,14 @@ requestInfoUserstoExclude: []
newIssueWelcomeComment: >
:wave: Thanks for opening your first issue here!
If you're reporting a :bug: bug, please make sure you include steps to reproduce it.
Also, logs, error messages and information about your hardware might be usefull.
Also, logs, error messages and information about your hardware might be useful.
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
:sparkling_heart: Thanks for opening this pull request! :sparkling_heart:
If your PR gets accepted and merged in, we will invite you to the project :tada:
:sparkling_heart: Thanks for opening this pull request! :sparkling_heart:
If your PR gets accepted and merged in, we will invite you to the project :tada:
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge

12
.github/settings.yml vendored
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
@@ -42,10 +42,10 @@ labels:
description: "New features or options."
- name: "Type: Support"
color: 5319e7
description: "Marks an issue as an support ticket."
description: "Marks an issue as a support ticket."
- name: "Type: Discussion"
color: d4c5f9
description: "Marks an issue as an generic discussion ticket."
description: "Marks an issue as a generic discussion ticket."
- name: "Type: Maintenance"
color: 2af79e
description: "Generic maintenance tasks, e.g., package updates."
@@ -53,13 +53,13 @@ labels:
# Additional markers
- name: "Security"
color: ee0701
description: "Marks an security issues that needs to be resolved asap."
description: "Marks a security issue that needs to be resolved asap."
- name: "Idea"
color: fef2c0
description: "Marks an idea, which might be excepted and implemented."
- name: "Incomplete"
color: fef2c0
description: "Marks an PR or issue that is missing information."
description: "Marks a PR or issue that is missing information."
- name: "Pull request"
color: fbca04
description: "There is an PR opened for this issue."

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

@@ -7,8 +7,8 @@ variables:
ADDON_TARGET: "zerotier"
ADDON_LEGACY_TAGS: "true"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:5.0.2"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:5.0.2"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:5.0.2"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:5.0.2"
ADDON_I386_BASE: "hassioaddons/base-i386:5.0.2"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:7.0.2"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:7.0.2"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:7.0.2"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:7.0.2"
ADDON_I386_BASE: "hassioaddons/base-i386:7.0.2"

View File

@@ -1,6 +1,6 @@
# MIT License
Copyright (c) 2019 Franck Nijhof
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

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]
@@ -17,9 +17,9 @@
[![Discord][discord-shield]][discord]
[![Community Forum][forum-shield]][forum]
[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
[![Support my work on Patreon][patreon-shield]][patreon]
[![Support Frenck on Patreon][patreon-shield]][patreon]
Radically simplify your network with a virtual networking layer that works
the same everywhere.
@@ -38,33 +38,27 @@ 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.
comparison to installing any other Home Assistant add-on.
1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance.
1. Install the "ZeroTier One" 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.
**NOTE**: Do not add this repository to Hass.io, please use:
`https://github.com/hassio-addons/repository`.
## Configuration
**Note**: _Remember to restart the add-on when the configuration is changed._
Example add-on configuration:
```json
{
"networks":[
"wgfyiwe73747457",
"fhu3888892jjfdk"
],
"api_auth_token":""
}
```yaml
networks:
- wgfyiwe73747457
- fhu3888892jjfdk
api_auth_token: ''
```
**Note**: _This is just an example, don't copy and paste it! Create your own!_
@@ -127,7 +121,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.
@@ -153,18 +147,18 @@ 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
MIT License
Copyright (c) 2019 Franck Nijhof
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
@@ -189,8 +183,6 @@ SOFTWARE.
[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
[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
[buymeacoffee]: https://www.buymeacoffee.com/frenck
[commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-zerotier.svg
[commits]: https://github.com/hassio-addons/addon-zerotier/commits/master
[contributors]: https://github.com/hassio-addons/addon-zerotier/graphs/contributors
@@ -199,8 +191,10 @@ SOFTWARE.
[discord]: https://discord.me/hassioaddons
[dockerhub]: https://hub.docker.com/r/hassioaddons/zerotier
[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
@@ -208,9 +202,9 @@ SOFTWARE.
[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/2019.svg
[patreon-shield]: https://www.frenck.nl/images/patreon.png
[patreon]: https://www.patreon.com/
[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/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

View File

@@ -1,12 +1,12 @@
# 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]
[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
[![Support my work on Patreon][patreon-shield]][patreon]
[![Support Frenck on Patreon][patreon-shield]][patreon]
Radically simplify your network with a virtual networking layer that works
the same everywhere.
@@ -27,8 +27,8 @@ can now add your Home Assistant instance using this add-on.
{% 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 +48,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.
@@ -63,15 +63,15 @@ If you are more interested in stable releases of our add-ons:
<https://github.com/hassio-addons/repository>
{% endif %}
[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
[buymeacoffee]: https://www.buymeacoffee.com/frenck
[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
[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
[patreon-shield]: https://www.frenck.nl/images/patreon.png
[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
[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
[patreon]: https://www.patreon.com/frenck
[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
[release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg

View File

@@ -1,26 +1,30 @@
ARG BUILD_FROM=hassioaddons/base:5.0.2
ARG BUILD_FROM=hassioaddons/base:7.0.2
# hadolint ignore=DL3006
FROM ${BUILD_FROM}
# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# We need to copy in the patches need during build
COPY rootfs/patches /patches
# Setup base
# hadolint ignore=DL3003
RUN \
apk add --no-cache --virtual .build-dependencies \
build-base=0.5-r1 \
linux-headers=4.19.36-r0 \
git=2.22.0-r0 \
git=2.24.1-r0 \
\
&& apk add --no-cache \
libgcc=8.3.0-r0 \
libstdc++=8.3.0-r0 \
libgcc=9.2.0-r3 \
libstdc++=9.2.0-r3 \
\
&& git clone --branch "1.4.6" --depth=1 \
"https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
\
&& cd /tmp/zerotier \
&& patch -p1 < /patches/ZeroTierOne/gcc9-compat.patch \
&& make \
&& make install \
\
@@ -48,8 +52,8 @@ LABEL \
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.url="https://community.home-assistant.io/t/home-assistant-community-add-on-zerotier-one/109091?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.label-schema.vendor="Home Assistant Community Add-ons"

View File

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

View File

@@ -5,13 +5,7 @@
"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"
],
"arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
"ports": {
"9993/tcp": 9993
},
@@ -23,23 +17,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

View File

@@ -0,0 +1,21 @@
diff --git a/make-linux.mk b/make-linux.mk
index 9fd4f7b9..c409ce0b 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -260,12 +260,12 @@ endif
# ARM32 hell -- use conservative CFLAGS
ifeq ($(ZT_ARCHITECTURE),3)
ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
- override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ override CFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ override CXXFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
else
- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
+ override CFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
+ override CXXFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif