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

Merge branch 'main' into refactor/get-account-usage

Browse Source 
# Conflicts:
#	management/server/account.go
This commit is contained in:
bcmmbaga
2024-10-17 22:01:26 +03:00
parent 83be99c849 507a40bd7f
commit a82b5ce80e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/ui/netbird-ui.rb.tmpl
View File

@ -8,11 +8,11 @@ cask "{{ $projectName }}" do
if Hardware::CPU.intel? if Hardware::CPU.intel?
url "{{ $amdURL }}" url "{{ $amdURL }}"
sha256 "{{ crypto.SHA256 $amdFileBytes }}" sha256 "{{ crypto.SHA256 $amdFileBytes }}"
app "netbird_ui_darwin_amd64", target: "Netbird UI.app" app "netbird_ui_darwin", target: "Netbird UI.app"
else else
url "{{ $armURL }}" url "{{ $armURL }}"
sha256 "{{ crypto.SHA256 $armFileBytes }}" sha256 "{{ crypto.SHA256 $armFileBytes }}"
app "netbird_ui_darwin_arm64", target: "Netbird UI.app" app "netbird_ui_darwin", target: "Netbird UI.app"
end end
depends_on formula: "netbird" depends_on formula: "netbird"
@ -36,4 +36,4 @@ cask "{{ $projectName }}" do
name "Netbird UI" name "Netbird UI"
desc "Netbird UI Client" desc "Netbird UI Client"
homepage "https://www.netbird.io/" homepage "https://www.netbird.io/"
end end

2
management/server/account.go
View File

@ -2298,7 +2298,7 @@ func handleNotFound(err error) error {
} }
func domainIsUpToDate(domain string, domainCategory string, claims jwtclaims.AuthorizationClaims) bool { func domainIsUpToDate(domain string, domainCategory string, claims jwtclaims.AuthorizationClaims) bool {
return claims.Domain != "" && claims.Domain != domain && claims.DomainCategory == PrivateCategory && domainCategory != PrivateCategory return domainCategory == PrivateCategory || claims.DomainCategory != PrivateCategory || domain != claims.Domain
} }
func (am *DefaultAccountManager) SyncAndMarkPeer(ctx context.Context, accountID string, peerPubKey string, meta nbpeer.PeerSystemMeta, realIP net.IP) (*nbpeer.Peer, *NetworkMap, []*posture.Checks, error) { func (am *DefaultAccountManager) SyncAndMarkPeer(ctx context.Context, accountID string, peerPubKey string, meta nbpeer.PeerSystemMeta, realIP net.IP) (*nbpeer.Peer, *NetworkMap, []*posture.Checks, error) {

2
release_files/install.sh
View File

@ -86,7 +86,7 @@ download_release_binary() {
# Unzip the app and move to INSTALL_DIR # Unzip the app and move to INSTALL_DIR
unzip -q -o "$BINARY_NAME" unzip -q -o "$BINARY_NAME"
mv "netbird_ui_${OS_TYPE}_${ARCH}/" "$INSTALL_DIR/" mv -v "netbird_ui_${OS_TYPE}/" "$INSTALL_DIR/" || mv -v "netbird_ui_${OS_TYPE}_${ARCH}/" "$INSTALL_DIR/"
else else
${SUDO} mkdir -p "$INSTALL_DIR" ${SUDO} mkdir -p "$INSTALL_DIR"
tar -xzvf "$BINARY_NAME" tar -xzvf "$BINARY_NAME"