Rename NetBird add-on to netbird2

netbird2/README.md

@@ -1,4 +1,4 @@
-# Home assistant add-on: NetBird Server
+# Home assistant add-on: NetBird Server 2
 
 I maintain this and other Home Assistant add-ons in my free time: keeping up with upstream changes, HA changes, and testing on real hardware takes a lot of time (and some money). I use around 5-10 of my >110 addons so regularly I install test machines (and purchase some test services such as vpn) that I don't use myself to troubleshoot and improve the addons.
 
@@ -9,9 +9,9 @@ If this add-on saves you time or makes your setup easier, I would be very gratef
 
 ## Addon information
 
-![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird%2Fconfig.json)
+![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird2%2Fconfig.json)
-![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird%2Fconfig.json)
+![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird2%2Fconfig.json)
-![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird%2Fconfig.json)
+![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnetbird2%2Fconfig.json)
 
 [donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
 [paypal-badge]: https://img.shields.io/badge/Donate%20via%20PayPal-0070BA?logo=paypal&style=flat&logoColor=white
@@ -92,8 +92,8 @@ The add-on uses s6 supervision; if any NetBird component exits, the supervisor r
 
 ```bash
 # From the repository root
-ha addons build netbird
+ha addons build netbird2
-ha addons install ./netbird
+ha addons install ./netbird2
 ```
 
 [repository]: https://github.com/alexbelgium/hassio-addons

netbird2/config.json

@@ -1,7 +1,7 @@
 {
-  "name": "NetBird Server",
+  "name": "NetBird Server 2",
-  "version": "0.1.0",
+  "version": "0.1.1",
-  "slug": "netbird",
+  "slug": "netbird2",
   "description": "Secure, WireGuard-based overlay network server (NetBird management + signal + optional dashboard).",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "arch": [

netbird2/rootfs/etc/cont-init.d/00-netbird-config.sh

@@ -36,9 +36,11 @@ export NETBIRD_DATA_DIR="${DATA_PATH}"
 export NETBIRD_STORE_CONFIG_ENGINE="sqlite"
 export NETBIRD_MGMT_DISABLE_DEFAULT_POLICY=$(bashio::config.true 'disable_default_policy' && echo true || echo false)
 
+SCHEME="http"
 if [[ -n "${SSL_CERT}" && -n "${SSL_KEY}" ]]; then
     export NETBIRD_MGMT_API_CERT_FILE="${SSL_CERT}"
     export NETBIRD_MGMT_API_CERT_KEY_FILE="${SSL_KEY}"
+    SCHEME="https"
 else
     export NETBIRD_MGMT_API_CERT_FILE=""
     export NETBIRD_MGMT_API_CERT_KEY_FILE=""
@@ -50,8 +52,8 @@ export NETBIRD_AUTH_JWT_CERTS="${AUTH_JWT_CERTS}"
 export NETBIRD_AUTH_USER_ID_CLAIM="${AUTH_USER_ID_CLAIM}"
 export NETBIRD_AUTH_OIDC_CONFIGURATION_ENDPOINT="${AUTH_OIDC_CONFIGURATION_ENDPOINT}"
 
-export NETBIRD_MGMT_API_ENDPOINT="https://${DOMAIN}:${MANAGEMENT_PORT}"
+export NETBIRD_MGMT_API_ENDPOINT="${SCHEME}://${DOMAIN}:${MANAGEMENT_PORT}"
-export NETBIRD_MGMT_GRPC_API_ENDPOINT="https://${DOMAIN}:${MANAGEMENT_PORT}"
+export NETBIRD_MGMT_GRPC_API_ENDPOINT="${SCHEME}://${DOMAIN}:${MANAGEMENT_PORT}"
 export AUTH_AUTHORITY="${AUTH_ISSUER}"
 export AUTH_AUDIENCE="${AUTH_AUDIENCE}"
 export AUTH_CLIENT_ID="${AUTH_CLIENT_ID}"