From 175ed5d12e908d5b232a8a69fef88fa986034d8a Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Sat, 1 Feb 2020 15:48:29 +0100
Subject: [PATCH] fix csf on ubuntu

---
 cyberpanel.sh         | 4 ++++
 cyberpanel_upgrade.sh | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 59f567bc2..ae27cba43 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1284,6 +1284,10 @@ watchdog_setup
 
 install_utility
 
+if [[ ! -f /usr/sbin/ipset ]] && [[ $SERVER_OS == "Ubuntu" ]] ; then
+ln -s /sbin/ipset /usr/sbin/ipset
+fi
+
 if [[ ! -f /usr/local/lsws/lsphp74/lib64/php/modules/zip.so ]] && [[ $SERVER_OS == "CentOS" ]] && [[ $CENTOS_8 == "False" ]]; then
 	yum list installed libzip-devel
 		if [[ $? == "0" ]] ; then
diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index c343d3cb8..b410f9426 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -155,6 +155,10 @@ cp lswsgi /usr/local/CyberCP/bin/
 sed -i 's|python2|python|g' /usr/bin/adminPass
 chmod 700 /usr/bin/adminPass
 
+if [[ ! -f /usr/sbin/ipset ]] && [[ $SERVER_OS == "Ubuntu" ]] ; then
+ln -s /sbin/ipset /usr/sbin/ipset
+fi
+
 if [[ -f /etc/cyberpanel/webadmin_passwd ]] ; then
 chmod 600 /etc/cyberpanel/webadmin_passwd
 fi
@@ -178,7 +182,6 @@ if [[ ! -f /usr/local/lsws/lsphp74/lib64/php/modules/zip.so ]] && [[ $SERVER_OS
 fi
 #fix the lsphp74-zip missing issue.
 
-#change python2 to python
 
 ##
 systemctl restart lscpd