extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-19 11:20:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/use-ip-for-default-routes-on-darwin

Browse Source
This commit is contained in:
Maycon Santos
2024-05-13 20:40:43 +02:00
parent 6fe247ec07 650bca7ca8
commit 01a0754399
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/internal/dns/server.go
View File

@@ -549,9 +549,7 @@ func (s *DefaultServer) upstreamCallbacks(
if nsGroup.Primary { if nsGroup.Primary {
s.currentConfig.RouteAll = true 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 { if err := s.hostManager.applyDNSConfig(s.currentConfig); err != nil {
l.WithError(err).Error("reactivate temporary disabled nameserver group, DNS update apply") l.WithError(err).Error("reactivate temporary disabled nameserver group, DNS update apply")

2
release_files/systemd/netbird-management.service
View File

@@ -13,7 +13,7 @@ RestartSec=5
TimeoutStopSec=10 TimeoutStopSec=10
CacheDirectory=netbird CacheDirectory=netbird
ConfigurationDirectory=netbird ConfigurationDirectory=netbird
LogDirectory=netbird LogsDirectory=netbird
RuntimeDirectory=netbird RuntimeDirectory=netbird
StateDirectory=netbird StateDirectory=netbird

2
release_files/systemd/netbird-signal.service
View File

@@ -13,7 +13,7 @@ RestartSec=5
TimeoutStopSec=10 TimeoutStopSec=10
CacheDirectory=netbird CacheDirectory=netbird
ConfigurationDirectory=netbird ConfigurationDirectory=netbird
LogDirectory=netbird LogsDirectory=netbird
RuntimeDirectory=netbird RuntimeDirectory=netbird
StateDirectory=netbird StateDirectory=netbird

5
release_files/systemd/netbird@.service
View File

@@ -13,7 +13,7 @@ RestartSec=5
TimeoutStopSec=10 TimeoutStopSec=10
CacheDirectory=netbird CacheDirectory=netbird
ConfigurationDirectory=netbird ConfigurationDirectory=netbird
LogDirectory=netbird LogsDirectory=netbird
RuntimeDirectory=netbird RuntimeDirectory=netbird
StateDirectory=netbird StateDirectory=netbird
@@ -28,7 +28,8 @@ ProtectControlGroups=yes
ProtectHome=yes ProtectHome=yes
ProtectHostname=yes ProtectHostname=yes
ProtectKernelLogs=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 ProtectKernelTunables=no
ProtectSystem=yes ProtectSystem=yes
RemoveIPC=yes RemoveIPC=yes