From 088346fd5ef79476c9a22a623c386381238df702 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Tue, 14 Feb 2023 21:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install/debian.sh | 13 +++++--------
 scripts/install/ubuntu.sh | 15 ++++++---------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh
index e8eb7800b..74393eecb 100644
--- a/scripts/install/debian.sh
+++ b/scripts/install/debian.sh
@@ -58,19 +58,16 @@ apt install -y python3-pip python3-dev python3-venv
 # 	ufw allow 888/tcp
 # fi
 
-# if [ -f /usr/sbin/ufw ];then
-# 	ufw disable
-# fi
-
-if [ ! -f /usr/sbin/firewalld ];then
+if [ ! -f /usr/sbin/ufw ];then
 	# look
     # firewall-cmd --list-all
+    # apt remove -y firewalld
 
 	apt install -y firewalld
 	systemctl enable firewalld
 	#取消服务锁定
     systemctl unmask firewalld
-	systemctl start firewalld
+	
 
 	if [ "$SSH_PORT" != "" ];then
 		firewall-cmd --permanent --zone=public --add-port=${SSH_PORT}/tcp
@@ -81,13 +78,13 @@ if [ ! -f /usr/sbin/firewalld ];then
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
 
+	systemctl start firewalld
+
 	# fix:debian10 firewalld faq
 	# https://kawsing.gitbook.io/opensystem/andoid-shou-ji/untitled/fang-huo-qiang#debian-10-firewalld-0.6.3-error-commandfailed-usrsbinip6tablesrestorewn-failed-ip6tablesrestore-v1.8
 	sed -i 's#IndividualCalls=no#IndividualCalls=yes#g' /etc/firewalld/firewalld.conf
 
 	firewall-cmd --reload
-	#安装时不开启
-	systemctl stop firewalld
 fi
 
 #fix zlib1g-dev fail
diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh
index fc57fcec3..2fd344ae8 100644
--- a/scripts/install/ubuntu.sh
+++ b/scripts/install/ubuntu.sh
@@ -44,14 +44,10 @@ echo "SSH PORT:${SSH_PORT}"
 # 	ufw allow 888/tcp
 # fi
 
-# if [ -f /usr/sbin/ufw ];then
-# 	ufw disable
-# fi
-
 if [ ! -f /usr/sbin/firewalld ];then
 	apt install -y firewalld
 	systemctl enable firewalld
-	systemctl start firewalld
+	
 
 	if [ "$SSH_PORT" != "" ];then
 		firewall-cmd --permanent --zone=public --add-port=${SSH_PORT}/tcp
@@ -63,17 +59,18 @@ if [ ! -f /usr/sbin/firewalld ];then
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
 
+	systemctl start firewalld
+
 	# fix:debian10 firewalld faq
 	# https://kawsing.gitbook.io/opensystem/andoid-shou-ji/untitled/fang-huo-qiang#debian-10-firewalld-0.6.3-error-commandfailed-usrsbinip6tablesrestorewn-failed-ip6tablesrestore-v1.8
 	sed -i 's#IndividualCalls=no#IndividualCalls=yes#g' /etc/firewalld/firewalld.conf
 
 	firewall-cmd --reload
+	
+	# #安装时不开启
+	# systemctl stop firewalld
 fi
 
-#安装时不开启
-systemctl stop firewalld
-
-
 apt install -y devscripts
 apt install -y net-tools
 apt install -y python3-dev