Compare commits
5 Commits
alpha-1.16
...
alpha-1.21
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13408225b4 | ||
|
|
0f77aaa176 | ||
|
|
0bc7c0ba9f | ||
|
|
27428b69a0 | ||
|
|
582f92eec4 |
@@ -264,7 +264,7 @@ async def deploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
_log_action(db, customer_id, "deploy", "info",
|
||||
"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_stream_id = None
|
||||
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'})",
|
||||
)
|
||||
|
||||
# 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.
|
||||
# SSL can be set up manually in NPM later. Switching to HTTP
|
||||
# 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:
|
||||
_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)
|
||||
if config and config.dns_enabled and config.dns_server and config.dns_zone:
|
||||
try:
|
||||
@@ -484,17 +452,16 @@ async def undeploy_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
async def stop_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
"""Stop containers for a customer."""
|
||||
deployment = db.query(Deployment).filter(Deployment.customer_id == customer_id).first()
|
||||
customer = db.query(Customer).filter(Customer.id == customer_id).first()
|
||||
config = get_system_config(db)
|
||||
if not deployment or not config:
|
||||
return {"success": False, "error": "Deployment or config not found."}
|
||||
if not deployment or not config or not customer:
|
||||
return {"success": False, "error": "Deployment, customer or config not found."}
|
||||
|
||||
instance_dir = os.path.join(config.data_dir, customer.subdomain)
|
||||
ok = await docker_service.compose_stop(instance_dir, deployment.container_prefix)
|
||||
if ok:
|
||||
deployment.deployment_status = "stopped"
|
||||
customer = db.query(Customer).filter(Customer.id == customer_id).first()
|
||||
if customer:
|
||||
customer.status = "inactive"
|
||||
customer.status = "inactive"
|
||||
db.commit()
|
||||
_log_action(db, customer_id, "stop", "success", "Containers stopped.")
|
||||
else:
|
||||
@@ -505,17 +472,16 @@ async def stop_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
async def start_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
"""Start containers for a customer."""
|
||||
deployment = db.query(Deployment).filter(Deployment.customer_id == customer_id).first()
|
||||
customer = db.query(Customer).filter(Customer.id == customer_id).first()
|
||||
config = get_system_config(db)
|
||||
if not deployment or not config:
|
||||
return {"success": False, "error": "Deployment or config not found."}
|
||||
if not deployment or not config or not customer:
|
||||
return {"success": False, "error": "Deployment, customer or config not found."}
|
||||
|
||||
instance_dir = os.path.join(config.data_dir, customer.subdomain)
|
||||
ok = await docker_service.compose_start(instance_dir, deployment.container_prefix)
|
||||
if ok:
|
||||
deployment.deployment_status = "running"
|
||||
customer = db.query(Customer).filter(Customer.id == customer_id).first()
|
||||
if customer:
|
||||
customer.status = "active"
|
||||
customer.status = "active"
|
||||
db.commit()
|
||||
_log_action(db, customer_id, "start", "success", "Containers started.")
|
||||
else:
|
||||
@@ -526,17 +492,16 @@ async def start_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
async def restart_customer(db: Session, customer_id: int) -> dict[str, Any]:
|
||||
"""Restart containers for a customer."""
|
||||
deployment = db.query(Deployment).filter(Deployment.customer_id == customer_id).first()
|
||||
customer = db.query(Customer).filter(Customer.id == customer_id).first()
|
||||
config = get_system_config(db)
|
||||
if not deployment or not config:
|
||||
return {"success": False, "error": "Deployment or config not found."}
|
||||
if not deployment or not config or not customer:
|
||||
return {"success": False, "error": "Deployment, customer or config not found."}
|
||||
|
||||
instance_dir = os.path.join(config.data_dir, customer.subdomain)
|
||||
ok = await docker_service.compose_restart(instance_dir, deployment.container_prefix)
|
||||
if ok:
|
||||
deployment.deployment_status = "running"
|
||||
customer = db.query(Customer).filter(Customer.id == customer_id).first()
|
||||
if customer:
|
||||
customer.status = "active"
|
||||
customer.status = "active"
|
||||
db.commit()
|
||||
_log_action(db, customer_id, "restart", "success", "Containers restarted.")
|
||||
else:
|
||||
|
||||
@@ -252,6 +252,16 @@ def trigger_update(config: Any, db_path: str) -> dict:
|
||||
pull_cmd = ["git", "-C", SOURCE_DIR, "pull", "origin", branch]
|
||||
|
||||
# 3. Git pull (synchronous — must complete before rebuild)
|
||||
# Ensure .git directory is owned by the process user (root inside container).
|
||||
# The .git dir may be owned by the host user after manual operations.
|
||||
try:
|
||||
subprocess.run(
|
||||
["git", "config", "--global", "--add", "safe.directory", SOURCE_DIR],
|
||||
capture_output=True, timeout=10,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
result = subprocess.run(
|
||||
pull_cmd,
|
||||
@@ -275,6 +285,15 @@ def trigger_update(config: Any, db_path: str) -> dict:
|
||||
|
||||
logger.info("git pull succeeded: %s", result.stdout.strip()[:200])
|
||||
|
||||
# Fetch tags separately — git pull does not always pull all tags
|
||||
try:
|
||||
subprocess.run(
|
||||
["git", "-C", SOURCE_DIR, "fetch", "--tags"],
|
||||
capture_output=True, text=True, timeout=30,
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning("git fetch --tags failed (non-fatal): %s", exc)
|
||||
|
||||
# 4. Read version info from the freshly-pulled source
|
||||
build_env = os.environ.copy()
|
||||
try:
|
||||
|
||||
@@ -188,3 +188,36 @@ body.i18n-loading #app-page {
|
||||
font-weight: 600;
|
||||
background: rgba(0, 0, 0, 0.02);
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
Dark mode overrides (Bootstrap 5.3 data-bs-theme="dark")
|
||||
Bootstrap handles most components automatically; only custom elements need
|
||||
explicit overrides here.
|
||||
--------------------------------------------------------------------------- */
|
||||
[data-bs-theme="dark"] .card {
|
||||
border-color: rgba(255, 255, 255, 0.08);
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .card-header {
|
||||
background: rgba(255, 255, 255, 0.04);
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .log-entry {
|
||||
border-bottom-color: rgba(255, 255, 255, 0.07);
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .log-time {
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .table th {
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .login-container {
|
||||
background: linear-gradient(135deg, #0d0d1a 0%, #0a1020 50%, #071525 100%);
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .stat-card {
|
||||
background: var(--bs-card-bg);
|
||||
}
|
||||
|
||||
21
static/favicon.svg
Normal file
21
static/favicon.svg
Normal file
@@ -0,0 +1,21 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
|
||||
<!-- Blue rounded background -->
|
||||
<rect width="32" height="32" rx="7" fill="#2563EB"/>
|
||||
|
||||
<!-- Bird silhouette: top-down view, wings spread, forked tail -->
|
||||
<path fill="white" d="
|
||||
M 16 7
|
||||
C 15 8 14 9.5 14 11
|
||||
C 11 10.5 7 11 4 14
|
||||
C 8 15 12 14.5 14 14.5
|
||||
L 15 22
|
||||
L 13 26
|
||||
L 16 24
|
||||
L 19 26
|
||||
L 17 22
|
||||
L 18 14.5
|
||||
C 20 14.5 24 15 28 14
|
||||
C 25 11 21 10.5 18 11
|
||||
C 18 9.5 17 8 16 7 Z
|
||||
"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 496 B |
@@ -5,6 +5,14 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>NetBird MSP Appliance</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||
<script>
|
||||
// Apply dark mode before page renders to prevent flash
|
||||
(function () {
|
||||
const saved = localStorage.getItem('darkMode');
|
||||
if (saved === 'dark') document.documentElement.setAttribute('data-bs-theme', 'dark');
|
||||
})();
|
||||
</script>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.2/font/bootstrap-icons.min.css" rel="stylesheet">
|
||||
<link href="/static/css/styles.css" rel="stylesheet">
|
||||
@@ -108,6 +116,10 @@
|
||||
<span id="nav-brand-name">NetBird MSP</span>
|
||||
</a>
|
||||
<div class="d-flex align-items-center">
|
||||
<!-- Dark Mode Toggle -->
|
||||
<button class="btn btn-outline-light btn-sm me-2" id="darkmode-toggle" onclick="toggleDarkMode()" title="Toggle dark mode">
|
||||
<i id="darkmode-icon" class="bi bi-moon-fill"></i>
|
||||
</button>
|
||||
<!-- Language Switcher -->
|
||||
<div class="dropdown me-2">
|
||||
<button class="btn btn-outline-light btn-sm dropdown-toggle" id="language-switcher-btn"
|
||||
|
||||
@@ -66,10 +66,35 @@ async function api(method, path, body = null) {
|
||||
return data;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Dark mode
|
||||
// ---------------------------------------------------------------------------
|
||||
function toggleDarkMode() {
|
||||
const isDark = document.documentElement.getAttribute('data-bs-theme') === 'dark';
|
||||
if (isDark) {
|
||||
document.documentElement.removeAttribute('data-bs-theme');
|
||||
localStorage.setItem('darkMode', 'light');
|
||||
document.getElementById('darkmode-icon').className = 'bi bi-moon-fill';
|
||||
} else {
|
||||
document.documentElement.setAttribute('data-bs-theme', 'dark');
|
||||
localStorage.setItem('darkMode', 'dark');
|
||||
document.getElementById('darkmode-icon').className = 'bi bi-sun-fill';
|
||||
}
|
||||
}
|
||||
|
||||
function syncDarkmodeIcon() {
|
||||
const icon = document.getElementById('darkmode-icon');
|
||||
if (!icon) return;
|
||||
icon.className = document.documentElement.getAttribute('data-bs-theme') === 'dark'
|
||||
? 'bi bi-sun-fill'
|
||||
: 'bi bi-moon-fill';
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Auth
|
||||
// ---------------------------------------------------------------------------
|
||||
async function initApp() {
|
||||
syncDarkmodeIcon();
|
||||
await initI18n();
|
||||
await loadBranding();
|
||||
await loadAzureLoginConfig();
|
||||
|
||||
Reference in New Issue
Block a user