From 570e28d227eb025a6cad7ee5b789847b7c3a112a Mon Sep 17 00:00:00 2001 From: Ishan Arora Date: Mon, 13 May 2024 09:40:57 +0000 Subject: [PATCH 1/2] Fix typo in systemd .service files (#1972) --- release_files/systemd/netbird-management.service | 2 +- release_files/systemd/netbird-signal.service | 2 +- release_files/systemd/netbird@.service | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/release_files/systemd/netbird-management.service b/release_files/systemd/netbird-management.service index 7fc0aa9ed..d9e485c73 100644 --- a/release_files/systemd/netbird-management.service +++ b/release_files/systemd/netbird-management.service @@ -13,7 +13,7 @@ RestartSec=5 TimeoutStopSec=10 CacheDirectory=netbird ConfigurationDirectory=netbird -LogDirectory=netbird +LogsDirectory=netbird RuntimeDirectory=netbird StateDirectory=netbird diff --git a/release_files/systemd/netbird-signal.service b/release_files/systemd/netbird-signal.service index c7e775f49..6333026eb 100644 --- a/release_files/systemd/netbird-signal.service +++ b/release_files/systemd/netbird-signal.service @@ -13,7 +13,7 @@ RestartSec=5 TimeoutStopSec=10 CacheDirectory=netbird ConfigurationDirectory=netbird -LogDirectory=netbird +LogsDirectory=netbird RuntimeDirectory=netbird StateDirectory=netbird diff --git a/release_files/systemd/netbird@.service b/release_files/systemd/netbird@.service index 39e3b6b23..095c3142d 100644 --- a/release_files/systemd/netbird@.service +++ b/release_files/systemd/netbird@.service @@ -13,7 +13,7 @@ RestartSec=5 TimeoutStopSec=10 CacheDirectory=netbird ConfigurationDirectory=netbird -LogDirectory=netbird +LogsDirectory=netbird RuntimeDirectory=netbird StateDirectory=netbird @@ -28,7 +28,8 @@ ProtectControlGroups=yes ProtectHome=yes ProtectHostname=yes ProtectKernelLogs=yes -ProtectKernelModules=no # needed to load wg module for kernel-mode WireGuard +# needed to load wg module for kernel-mode WireGuard +ProtectKernelModules=no ProtectKernelTunables=no ProtectSystem=yes RemoveIPC=yes From 650bca7ca8f1664e2e2707edeb8e073d22fad4f2 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Mon, 13 May 2024 18:11:08 +0200 Subject: [PATCH 2/2] Fix lost root zone handler (#1975) When there is a connection issue with the root zone upstream we remove it from the dns mux, and we need to add it again --- client/internal/dns/server.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go index 8f6e8b572..267c1ed80 100644 --- a/client/internal/dns/server.go +++ b/client/internal/dns/server.go @@ -549,9 +549,7 @@ func (s *DefaultServer) upstreamCallbacks( if nsGroup.Primary { s.currentConfig.RouteAll = true - if runtime.GOOS == "android" { - s.service.RegisterMux(nbdns.RootZone, handler) - } + s.service.RegisterMux(nbdns.RootZone, handler) } if err := s.hostManager.applyDNSConfig(s.currentConfig); err != nil { l.WithError(err).Error("reactivate temporary disabled nameserver group, DNS update apply")