From 84d3ad7c7502a394a514ee6c6e1d9c8a3e8e2a8e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 10 Aug 2026 18:21:58 +0800
Subject: [PATCH] deploy.sh: use 18080/18443 for vhost ports instead of 80/443

- Avoid conflict with nginx/apache on common ports
- init_db.py now generates frps.ini at init time
- deploy.sh verifies frps.ini exists before starting frps
---
 init_db.py        |  9 ++++++---
 scripts/deploy.sh | 17 +++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/init_db.py b/init_db.py
index 06cff8d..cc6e3f3 100644
--- a/init_db.py
+++ b/init_db.py
@@ -1,11 +1,14 @@
 #!/usr/bin/env python3
-"""Initialize the frps-manager database."""
+"""Initialize the frps-manager database and generate frps.ini."""
 import os
 import sys
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-from app import app, db, seed_admin
+from app import app, db, seed_admin, write_frps_config
 
 with app.app_context():
     db.create_all()
     seed_admin()
-    print("Database initialized successfully")
\ No newline at end of file
+    # Generate frps.ini so frps.service can start on a fresh machine
+    content = write_frps_config()
+    print("Database initialized successfully")
+    print("frps.ini generated at runtime/conf/frps.ini")
\ No newline at end of file
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 5166696..43f11d2 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -103,10 +103,15 @@ if [ ! -d venv ]; then
   fi
 fi
 
-# --- db init ----------------------------------------------------------------
+# --- db init + frps.ini generation -------------------------------------------
 log "Initializing database"
 if [ "$DRY_RUN" = 0 ]; then
-  venv/bin/python init_db.py
+  mkdir -p runtime/conf runtime/logs instance
+  "$PROJECT_DIR/venv/bin/python" init_db.py
+  # Verify frps.ini was generated
+  if [ ! -f "$FRPS_INI" ]; then
+    die "frps.ini was not generated at $FRPS_INI — check init_db.py output"
+  fi
 fi
 
 # --- generate systemd units -------------------------------------------------
@@ -144,8 +149,8 @@ Environment=FRPS_DASHBOARD_URL=http://127.0.0.1:7500
 Environment=FRPS_DASHBOARD_USER=admin
 Environment=FRPS_DASHBOARD_PASS=admin123
 Environment=FRPS_BIND_PORT=7000
-Environment=FRPS_VHOST_HTTP_PORT=80
-Environment=FRPS_VHOST_HTTPS_PORT=443
+Environment=FRPS_VHOST_HTTP_PORT=18080
+Environment=FRPS_VHOST_HTTPS_PORT=18443
 ExecStart=$GUNICORN wsgi:app --bind 0.0.0.0:$PORT --workers 2 --timeout 30
 Restart=on-failure
 RestartSec=5
@@ -220,8 +225,8 @@ cat <<EOF
 
  frps bind:  0.0.0.0:7000
  frps dashboard: 127.0.0.1:7500  (admin / admin123)
- frps vhost_http:   0.0.0.0:80   (set FRPS_VHOST_HTTP_PORT in service to override)
- frps vhost_https:  0.0.0.0:443
+ frps vhost_http:   0.0.0.0:18080
+ frps vhost_https:  0.0.0.0:18443
 
  Systemd units (auto-generated with correct paths):
    /etc/systemd/system/frps.service