fix(deploy): remove NPM stream creation on customer deploy/undeploy
STUN/TURN UDP relay no longer requires NPM stream entries. NetBird uses rels:// WebSocket relay via NPM proxy host instead. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -264,7 +264,7 @@ async def deploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
|||||||
_log_action(db, customer_id, "deploy", "info",
|
_log_action(db, customer_id, "deploy", "info",
|
||||||
"Auto-setup failed — admin must complete setup manually.")
|
"Auto-setup failed — admin must complete setup manually.")
|
||||||
|
|
||||||
# Step 9: Create NPM proxy host + stream (production only)
|
# Step 9: Create NPM proxy host (production only)
|
||||||
npm_proxy_id = None
|
npm_proxy_id = None
|
||||||
npm_stream_id = None
|
npm_stream_id = None
|
||||||
if not local_mode:
|
if not local_mode:
|
||||||
@@ -294,27 +294,6 @@ async def deploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
|||||||
f"(SSL: {'OK' if ssl_ok else 'FAILED — check DNS and port 80 accessibility'})",
|
f"(SSL: {'OK' if ssl_ok else 'FAILED — check DNS and port 80 accessibility'})",
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create NPM UDP stream for relay STUN port
|
|
||||||
stream_result = await npm_service.create_stream(
|
|
||||||
api_url=config.npm_api_url,
|
|
||||||
npm_email=config.npm_api_email,
|
|
||||||
npm_password=config.npm_api_password,
|
|
||||||
incoming_port=allocated_port,
|
|
||||||
forwarding_host=forward_host,
|
|
||||||
forwarding_port=allocated_port,
|
|
||||||
)
|
|
||||||
npm_stream_id = stream_result.get("stream_id")
|
|
||||||
if stream_result.get("error"):
|
|
||||||
_log_action(
|
|
||||||
db, customer_id, "deploy", "error",
|
|
||||||
f"NPM stream creation failed: {stream_result['error']}",
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
_log_action(
|
|
||||||
db, customer_id, "deploy", "info",
|
|
||||||
f"NPM UDP stream created: port {allocated_port} -> {forward_host}:{allocated_port}",
|
|
||||||
)
|
|
||||||
|
|
||||||
# Note: Keep HTTPS configs even if SSL cert creation failed.
|
# Note: Keep HTTPS configs even if SSL cert creation failed.
|
||||||
# SSL can be set up manually in NPM later. Switching to HTTP
|
# SSL can be set up manually in NPM later. Switching to HTTP
|
||||||
# would break the dashboard when the user accesses via HTTPS.
|
# would break the dashboard when the user accesses via HTTPS.
|
||||||
@@ -443,17 +422,6 @@ async def undeploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
|||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
_log_action(db, customer_id, "undeploy", "error", f"NPM removal error: {exc}")
|
_log_action(db, customer_id, "undeploy", "error", f"NPM removal error: {exc}")
|
||||||
|
|
||||||
# Remove NPM stream
|
|
||||||
if deployment.npm_stream_id and config.npm_api_email:
|
|
||||||
try:
|
|
||||||
await npm_service.delete_stream(
|
|
||||||
config.npm_api_url, config.npm_api_email, config.npm_api_password,
|
|
||||||
deployment.npm_stream_id,
|
|
||||||
)
|
|
||||||
_log_action(db, customer_id, "undeploy", "info", "NPM stream removed.")
|
|
||||||
except Exception as exc:
|
|
||||||
_log_action(db, customer_id, "undeploy", "error", f"NPM stream removal error: {exc}")
|
|
||||||
|
|
||||||
# Remove Windows DNS A-record (non-fatal)
|
# Remove Windows DNS A-record (non-fatal)
|
||||||
if config and config.dns_enabled and config.dns_server and config.dns_zone:
|
if config and config.dns_enabled and config.dns_server and config.dns_zone:
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user