修复: 修复repair模式中的nginx配置备份逻辑
问题: - 备份文件保存在sites-enabled目录导致nginx测试失败 - nginx会读取该目录下所有文件包括旧的错误备份 解决方案: - 将备份文件保存到/root/目录而不是sites-enabled - 在生成新配置前先清理旧的.backup.*文件 - 使用2>/dev/null || true避免清理不存在文件时报错
This commit is contained in:
11
install.sh
11
install.sh
@@ -2342,10 +2342,14 @@ repair_load_existing_config() {
|
|||||||
repair_regenerate_nginx_config() {
|
repair_regenerate_nginx_config() {
|
||||||
print_step "重新生成Nginx配置..."
|
print_step "重新生成Nginx配置..."
|
||||||
|
|
||||||
# 备份现有配置
|
# 清理旧的备份文件(避免nginx读取到错误配置)
|
||||||
|
rm -f /etc/nginx/sites-enabled/${PROJECT_NAME}.conf.backup.* 2>/dev/null || true
|
||||||
|
rm -f /etc/nginx/sites-available/${PROJECT_NAME}.conf.backup.* 2>/dev/null || true
|
||||||
|
|
||||||
|
# 备份当前配置到 /root/
|
||||||
if [[ -f "/etc/nginx/sites-enabled/${PROJECT_NAME}.conf" ]]; then
|
if [[ -f "/etc/nginx/sites-enabled/${PROJECT_NAME}.conf" ]]; then
|
||||||
cp "/etc/nginx/sites-enabled/${PROJECT_NAME}.conf" "/etc/nginx/sites-enabled/${PROJECT_NAME}.conf.backup.$(date +%Y%m%d%H%M%S)"
|
cp "/etc/nginx/sites-enabled/${PROJECT_NAME}.conf" "/root/nginx-backup-${PROJECT_NAME}.conf.$(date +%Y%m%d%H%M%S)"
|
||||||
print_success "已备份现有配置"
|
print_success "已备份现有配置到 /root/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 调用现有的configure_nginx函数
|
# 调用现有的configure_nginx函数
|
||||||
@@ -2354,7 +2358,6 @@ repair_regenerate_nginx_config() {
|
|||||||
print_success "Nginx配置已重新生成"
|
print_success "Nginx配置已重新生成"
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
repair_restart_services() {
|
repair_restart_services() {
|
||||||
print_step "重启服务..."
|
print_step "重启服务..."
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user