From 6d01dd0bbb8bd4f1d32a3a174f04159af964cde7 Mon Sep 17 00:00:00 2001 From: Nikita Bizyaev Date: Thu, 7 May 2026 11:09:33 +0300 Subject: [PATCH] reset --- config.yaml | 11 ++++------- dashboard.env | 12 ++++++------ docker-compose.yml | 10 +++------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/config.yaml b/config.yaml index eaede7d..88a8fcd 100644 --- a/config.yaml +++ b/config.yaml @@ -1,6 +1,6 @@ server: listenAddress: ":80" - exposedAddress: "grpc://birdy.greact.online:50051" + exposedAddress: "https://birdy.greact.online" # домен, через который ходит UI и клиенты stunPorts: - 3478 logLevel: "info" @@ -8,7 +8,7 @@ server: authSecret: "0xO0NE2nsyAv3QWM6lYfYMKZ+TJ4BG4N93kpbCWYISg=" dataDir: "/var/lib/netbird" - auth: # ← вложено под server + auth: issuer: "https://birdy.greact.online/oauth2" localAuthDisabled: false signKeyRefreshEnabled: true @@ -18,10 +18,7 @@ server: cliRedirectURIs: - "http://localhost:53000/" - reverseProxy: - trustedHTTPProxies: - - "172.16.0.0/12" # Docker-подсеть (покрывает NPM-контейнер в сети proxy) - - store: # ← вложено под server + store: engine: "sqlite" encryptionKey: "0xO0NE2nsyAv3QWM6lYfYMKZ+TJ4BG4N93kpbCWYISg=" + \ No newline at end of file diff --git a/dashboard.env b/dashboard.env index 37d70bb..a9691cd 100644 --- a/dashboard.env +++ b/dashboard.env @@ -1,14 +1,14 @@ -NETBIRD_MGMT_API_ENDPOINT=grpc://birdy.greact.online:50051 -NETBIRD_MGMT_GRPC_API_ENDPOINT=grpc://birdy.greact.online:50051 +NETBIRD_MGMT_API_ENDPOINT=https://birdy.greact.online +NETBIRD_MGMT_GRPC_API_ENDPOINT=https://birdy.greact.online AUTH_AUDIENCE=netbird-dashboard AUTH_CLIENT_ID=netbird-dashboard -AUTH_CLIENT_SECRET= +AUTH_CLIENT_SECRET=0xO0NE2nsyAv3QWM6lYfYMKZ+TJ4BG4N93kpbCWYISg= AUTH_AUTHORITY=https://birdy.greact.online/oauth2 USE_AUTH0=false AUTH_SUPPORTED_SCOPES=openid profile email groups AUTH_REDIRECT_URI=/nb-auth AUTH_SILENT_REDIRECT_URI=/nb-silent-auth -LETSENCRYPT_DOMAIN=none -LETSENCRYPT_EMAIL=example@local -NGINX_SSL_PORT=443 \ No newline at end of file +LETSENCRYPT_DOMAIN=birdy.greact.online +LETSENCRYPT_EMAIL=cap7goo@gmail.com +NGINX_SSL_PORT=443 diff --git a/docker-compose.yml b/docker-compose.yml index 460311d..5ba8813 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.8" - services: netbird-server: build: @@ -7,10 +5,11 @@ services: dockerfile: Dockerfile.netbird-server container_name: netbird-server expose: - - "80" # Management API + OAuth2 + Signal → внутрь proxy-сети + - "80" # Management API + OAuth2 + Signal -- внутрь proxy-сети ports: + - "50051:80" # management gRPC + - "33080:33080" # relay (TCP) - "3478:3478/udp" # STUN - - "50051:80" # публичный TCP‑порт для management volumes: - netbird_data:/var/lib/netbird # именованный volume (не bind-mount) networks: @@ -36,9 +35,6 @@ services: - NGINX_SSL_PORT=${NGINX_SSL_PORT} expose: - "80" - ports: - - "3478:3478/udp" # STUN, как было - - "8444:80" # ← новый публичный TCP‑порт для management (пример) networks: - proxy