Merge branch 'main' into crowdsec-integration

# Conflicts:
#	shared/management/proto/proxy_service.pb.go
This commit is contained in:
Viktor Liu
2026-04-01 19:59:14 +02:00
70 changed files with 6354 additions and 565 deletions

View File

@@ -1,8 +1,13 @@
package main
import (
"net/http"
// nolint:gosec
_ "net/http/pprof"
"runtime"
log "github.com/sirupsen/logrus"
"github.com/netbirdio/netbird/proxy/cmd/proxy/cmd"
)
@@ -21,6 +26,9 @@ var (
)
func main() {
go func() {
log.Println(http.ListenAndServe("localhost:6060", nil))
}()
cmd.SetVersionInfo(Version, Commit, BuildDate, GoVersion)
cmd.Execute()
}