diff --git a/jsite.sh b/jsite.sh index f9b5720..88e168b 100644 --- a/jsite.sh +++ b/jsite.sh @@ -614,13 +614,9 @@ install_pm2() { log_success "PM2安装完成" fi - # 设置PM2开机自启(避免交互式输出) + # 设置PM2开机自启 log_info "配置PM2开机自启..." - su - jingrow -c " - export NVM_DIR=\"\$HOME/.nvm\" - [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" - pm2 startup 2>/dev/null || true - " + sudo env PATH="$PATH:/home/jingrow/.nvm/versions/node/v22.18.0/bin" pm2 startup systemd -u jingrow --hp /home/jingrow --service-name pm2-jingrow --silent log_success "PM2开机自启配置完成" } @@ -2190,21 +2186,10 @@ autostartup_site() { return 1 fi - # 确保PM2已安装并配置开机自启 - log_info "配置PM2开机自启..." - su - jingrow -c " - export NVM_DIR=\"\$HOME/.nvm\" - [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" - pm2 startup 2>/dev/null || true - " - - # 保存当前PM2配置 - log_info "保存PM2配置..." - su - jingrow -c " - export NVM_DIR=\"\$HOME/.nvm\" - [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" - pm2 save - " + # 保存PM2进程列表 + log_info "保存PM2进程列表..." + sudo env PATH="$PATH:/home/jingrow/.nvm/versions/node/v22.18.0/bin" su - jingrow -c "pm2 save --silent" + log_success "PM2进程列表保存完成" log_success "网站 $SITE_NAME 自动启动配置完成" log_info "服务器重启后,网站将自动启动"