Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 14:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.3.9-dev' into v2.3.9

Browse Source
This commit is contained in:
usmannasir
2025-03-08 14:33:38 +05:00
parent 48649804c0 f58fef2934
commit c91d708e5d
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cyberpanel_upgrade.sh
View File

@@ -16,6 +16,23 @@ Sudo_Test=$(set)
Set_Default_Variables() { Set_Default_Variables() {
#### this is temp code for csf
rm -Rfv /usr/local/CyberCP/configservercsf
rm -fv /home/cyberpanel/plugins/configservercsf
rm -Rfv /usr/local/CyberCP/public/static/configservercsf
sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/settings.py
sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/urls.py
if [ ! -e /etc/cxs/cxs.pl ]; then
sed -i "/configserver/d" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html
fi
#systemctl restart lscpd
### this is temp code for csf
export LC_CTYPE=en_US.UTF-8 export LC_CTYPE=en_US.UTF-8
echo -e "\nFetching latest data from CyberPanel server...\n" echo -e "\nFetching latest data from CyberPanel server...\n"
echo -e "This may take few seconds..." echo -e "This may take few seconds..."
@@ -894,21 +911,6 @@ systemctl restart lscpd
Post_Install_Display_Final_Info() { Post_Install_Display_Final_Info() {
#### this is temp code for csf
rm -Rfv /usr/local/CyberCP/configservercsf
rm -fv /home/cyberpanel/plugins/configservercsf
rm -Rfv /usr/local/CyberCP/public/static/configservercsf
sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/settings.py
sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/urls.py
if [ ! -e /etc/cxs/cxs.pl ]; then
sed -i "/configserver/d" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html
fi
#systemctl restart lscpd
### this is temp code for csf
Panel_Port=$(cat /usr/local/lscp/conf/bind.conf) Panel_Port=$(cat /usr/local/lscp/conf/bind.conf)
if [[ $Panel_Port = "" ]] ; then if [[ $Panel_Port = "" ]] ; then
Panel_Port="8090" Panel_Port="8090"

16
plogical/upgrade.py
View File

@@ -3475,9 +3475,9 @@ pm.max_spare_servers = 3
## ##
execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" # execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py"
execPath = execPath + " removeCSF" # execPath = execPath + " removeCSF"
Upgrade.executioner(execPath, 'fix csf if there', 0) # Upgrade.executioner(execPath, 'fix csf if there', 0)
Upgrade.downloadAndUpgrade(versionNumbring, branch) Upgrade.downloadAndUpgrade(versionNumbring, branch)
versionNumbring = Upgrade.downloadLink() versionNumbring = Upgrade.downloadLink()
@@ -3609,12 +3609,12 @@ pm.max_spare_servers = 3
print("Backing up files...") print("Backing up files...")
backup_files() backup_files()
# execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py"
# execPath = execPath + " removeCSF" execPath = execPath + " removeCSF"
# Upgrade.executioner(execPath, 'fix csf if there', 0) Upgrade.executioner(execPath, 'fix csf if there', 0)
# execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py" execPath = "sudo /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/csf.py"
# execPath = execPath + " installCSF" execPath = execPath + " installCSF"
# Restore the files # Restore the files
print("Restoring files...") print("Restoring files...")