Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 22:06:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor service management in installation scripts: Updated cyberpanel.sh to enhance the display of access information and system status. Improved install.py by adding comprehensive service checks and fixes for PowerDNS, Pure-FTPd, and database connectivity. Enhanced LiteSpeed configuration handling and ensured critical services are running properly during installation. Added detailed logging for better user feedback.

Browse Source
This commit is contained in:
Master3395
2025-09-23 22:35:47 +02:00
parent 4b045ac898
commit f41b54205b
3 changed files with 602 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
cyberpanel.sh
View File

@@ -2165,34 +2165,34 @@ echo "║
echo "╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝" echo "╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝"
echo -e "\n" echo -e "\n"
echo "╔══════════════════════════════════════════════════════════════════════════════════════╗" echo "╔═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╗"
echo "║ ║" echo "║ ║"
echo "║ 🌐 ACCESS YOUR CYBERPANEL: ║" echo "║ 🌐 ACCESS YOUR CYBERPANEL: ║"
echo "║ ║" echo "║ ║"
echo "║ • URL: https://$Server_IP:8090 ║" echo "║ • URL: https://$Server_IP:8090 ║"
echo "║ • Username: admin ║" echo "║ • Username: admin ║"
if [[ "$Custom_Pass" = "True" ]]; then if [[ "$Custom_Pass" = "True" ]]; then
echo "║ • Password: ***** (custom password) ║" echo "║ • Password: ***** (custom password) ║"
else else
echo "║ • Password: $Admin_Pass ║" echo "║ • Password: $Admin_Pass ║"
fi fi
echo "║ ║" echo "║ ║"
echo "║ ⚠️ Please change the default password immediately! ║" echo "║ ⚠️ Please change the default password immediately! ║"
echo "║ ║" echo "║ ║"
echo "╚══════════════════════════════════════════════════════════════════════════════════════╝" echo "╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝"
echo -e "\n" echo -e "\n"
echo "╔══════════════════════════════════════════════════════════════════════════════════════╗" echo "╔═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╗"
echo "║ ║" echo "║ ║"
echo "║ 📊 SYSTEM STATUS: ║" echo "║ 📊 SYSTEM STATUS: ║"
echo "║ ║" echo "║ ║"
echo "║ 💾 Disk Usage: $(df -h | awk '$NF=="/"{printf "%d/%dGB (%s)", $3,$2,$5}') ║" echo "║ 💾 Disk Usage: $(df -h | awk '$NF=="/"{printf "%d/%dGB (%s)", $3,$2,$5}') ║"
echo "║ 🧠 RAM Usage: $(free -m | awk 'NR==2{printf "%s/%sMB (%.2f%%)", $3,$2,$3*100/$2 }') ║" echo "║ 🧠 RAM Usage: $(free -m | awk 'NR==2{printf "%s/%sMB (%.2f%%)", $3,$2,$3*100/$2 }') ║"
echo "║ ⏱️ Install Time: $Elapsed_Time ║" echo "║ ⏱️ Install Time: $Elapsed_Time ║"
echo "║ ║" echo "║ ║"
echo "║ 🎉 INSTALLATION COMPLETED SUCCESSFULLY! 🎉 ║" echo "║ 🎉 INSTALLATION COMPLETED SUCCESSFULLY! 🎉 ║"
echo "║ ║" echo "║ ║"
echo "╚══════════════════════════════════════════════════════════════════════════════════════╝" echo "╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝"
#echo " Visit: https://$Server_IP:7080 " #echo " Visit: https://$Server_IP:7080 "
#echo " WebAdmin console username: admin " #echo " WebAdmin console username: admin "
#echo " WebAdmin console password: $Webadmin_Pass " #echo " WebAdmin console password: $Webadmin_Pass "
@@ -2200,19 +2200,25 @@ echo "╚═══════════════════════
#echo " Visit: https://$Server_IP:8090/snappymail/?admin " #echo " Visit: https://$Server_IP:8090/snappymail/?admin "
#echo " snappymail Admin username: admin " #echo " snappymail Admin username: admin "
#echo " snappymail Admin password: $snappymailAdminPass " #echo " snappymail Admin password: $snappymailAdminPass "
echo " " echo "╔═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╗"
echo -e " Run \e[31mcyberpanel help\e[39m to get FAQ info" echo "║ ║"
echo -e " Run \e[31mcyberpanel upgrade\e[39m to upgrade it to latest version." echo "║ 🛠️ COMMANDS & RESOURCES: ║"
echo -e " Run \e[31mcyberpanel utility\e[39m to access some handy tools ." echo "║ ║"
echo " " echo -e "║ Run \e[31mcyberpanel help\e[39m to get FAQ info ║"
echo " Website : https://www.cyberpanel.net " echo -e "║ Run \e[31mcyberpanel upgrade\e[39m to upgrade it to latest version. ║"
echo " Forums : https://forums.cyberpanel.net " echo -e "║ Run \e[31mcyberpanel utility\e[39m to access some handy tools . ║"
echo " Wikipage: https://cyberpanel.net/KnowledgeBase/ " echo "║ ║"
echo " Docs : https://cyberpanel.net/docs/ " echo "║ 🔗 OFFICIAL LINKS: ║"
echo " " echo "║ ║"
echo -e " Enjoy your accelerated Internet by " echo "║ Website : https://www.cyberpanel.net ║"
echo -e " CyberPanel & $Word " echo "║ Forums : https://forums.cyberpanel.net ║"
echo "###################################################################" echo "║ Wikipage: https://cyberpanel.net/KnowledgeBase/ ║"
echo "║ Docs : https://cyberpanel.net/docs/ ║"
echo "║ ║"
echo -e "║ Enjoy your accelerated Internet by ║"
echo -e "║ CyberPanel & $Word ║"
echo "║ ║"
echo "╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝"
if [[ "$Server_Provider" != "Undefined" ]]; then if [[ "$Server_Provider" != "Undefined" ]]; then
echo -e "\033[0;32m$Server_Provider\033[39m detected..." echo -e "\033[0;32m$Server_Provider\033[39m detected..."

250
install/install.py
View File

@@ -2679,7 +2679,7 @@ milter_default_action = accept
if state == 'off': if state == 'off':
pdns_service = self.get_service_name('pdns') pdns_service = preFlightsChecks.get_service_name('pdns')
command = f'sudo systemctl stop {pdns_service}' command = f'sudo systemctl stop {pdns_service}'
subprocess.call(shlex.split(command)) subprocess.call(shlex.split(command))
@@ -2930,56 +2930,228 @@ vmail
preFlightsChecks.stdOut("Starting deferred services that depend on database tables...") preFlightsChecks.stdOut("Starting deferred services that depend on database tables...")
# Ensure database is ready first
self.ensureDatabaseReady()
# Start PowerDNS if it was installed # Start PowerDNS if it was installed
if os.path.exists('/home/cyberpanel/powerdns'): if os.path.exists('/home/cyberpanel/powerdns'):
preFlightsChecks.stdOut("Starting PowerDNS service...") self.fixAndStartPowerDNS()
pdns_service = self.get_service_name('pdns')
command = f'systemctl start {pdns_service}'
result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
if result == 1:
# Check if service started successfully
command = f'systemctl is-active {pdns_service}'
try:
output = subprocess.check_output(shlex.split(command)).decode("utf-8").strip()
if output == 'active':
preFlightsChecks.stdOut("PowerDNS service started successfully!")
else:
preFlightsChecks.stdOut("[WARNING] PowerDNS service may not have started properly. Status: " + output)
except:
preFlightsChecks.stdOut("[WARNING] Could not verify PowerDNS service status")
# Start Pure-FTPd if it was installed # Start Pure-FTPd if it was installed
if os.path.exists('/home/cyberpanel/pureftpd'): if os.path.exists('/home/cyberpanel/pureftpd'):
# Configure Pure-FTPd for Ubuntu 24.04 (SHA512 password hashing compatibility) self.fixAndStartPureFTPd()
if self.distro == ubuntu:
import install_utils # Ensure LiteSpeed services are running
try: self.ensureLiteSpeedServicesRunning()
release = install_utils.get_Ubuntu_release(use_print=False, exit_on_error=False)
if release and release >= 24.04: # Final service verification
preFlightsChecks.stdOut("Configuring Pure-FTPd for Ubuntu 24.04...") self.verifyCriticalServices()
# Change MYSQLCrypt from md5 to crypt for SHA512 compatibility
command = "sed -i 's/MYSQLCrypt md5/MYSQLCrypt crypt/g' /etc/pure-ftpd/db/mysql.conf"
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
except:
pass # If version detection fails, continue without configuration change
preFlightsChecks.stdOut("Starting Pure-FTPd service...") def ensureDatabaseReady(self):
ftpService = self.pureFTPDServiceName(self.distro) """Ensure database is ready before starting dependent services"""
command = f'systemctl start {ftpService}' preFlightsChecks.stdOut("Ensuring database is ready...")
result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Wait for MySQL/MariaDB to be ready
max_attempts = 30
for attempt in range(max_attempts):
try:
if subprocess.run(['mysqladmin', 'ping', '-h', 'localhost', '--silent'],
capture_output=True).returncode == 0:
preFlightsChecks.stdOut("Database is ready")
return
except:
pass
preFlightsChecks.stdOut(f"Waiting for database... ({attempt + 1}/{max_attempts})")
time.sleep(2)
preFlightsChecks.stdOut("[WARNING] Database may not be fully ready")
def fixAndStartPowerDNS(self):
"""Fix PowerDNS configuration and start the service"""
preFlightsChecks.stdOut("Fixing and starting PowerDNS service...")
# Determine correct service name
pdns_service = None
if subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True).stdout.find('pdns.service') != -1:
pdns_service = 'pdns'
elif subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True).stdout.find('powerdns.service') != -1:
pdns_service = 'powerdns'
if not pdns_service:
preFlightsChecks.stdOut("[WARNING] PowerDNS service not found")
return
# Fix PowerDNS configuration
config_files = ['/etc/pdns/pdns.conf', '/etc/powerdns/pdns.conf']
for config_file in config_files:
if os.path.exists(config_file):
preFlightsChecks.stdOut(f"Configuring PowerDNS: {config_file}")
# Add missing configuration if not present
with open(config_file, 'a') as f:
content = f.read() if os.path.getsize(config_file) > 0 else ""
if 'gmysql-password=' not in content:
f.write('\ngmysql-password=cyberpanel\n')
if 'launch=' not in content:
f.write('launch=gmysql\n')
# Ensure proper permissions
os.chmod(config_file, 0o644)
break
# Start PowerDNS service
command = f'systemctl start {pdns_service}'
result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
if result == 1:
# Enable service for auto-start
command = f'systemctl enable {pdns_service}'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
if result == 1: # Verify service is running
# Check if service started successfully command = f'systemctl is-active {pdns_service}'
command = f'systemctl is-active {ftpService}' try:
output = subprocess.check_output(shlex.split(command)).decode("utf-8").strip()
if output == 'active':
preFlightsChecks.stdOut("PowerDNS service started successfully!")
else:
preFlightsChecks.stdOut(f"[WARNING] PowerDNS service status: {output}")
# Try to get more details
command = f'systemctl status {pdns_service} --no-pager'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
except:
preFlightsChecks.stdOut("[WARNING] Could not verify PowerDNS service status")
def fixAndStartPureFTPd(self):
"""Fix Pure-FTPd configuration and start the service"""
preFlightsChecks.stdOut("Fixing and starting Pure-FTPd service...")
# Determine correct service name
ftp_service = None
if subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True).stdout.find('pure-ftpd.service') != -1:
ftp_service = 'pure-ftpd'
elif subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True).stdout.find('pureftpd.service') != -1:
ftp_service = 'pureftpd'
if not ftp_service:
preFlightsChecks.stdOut("[WARNING] Pure-FTPd service not found")
return
# Fix Pure-FTPd configuration
config_files = ['/etc/pure-ftpd/pureftpd-mysql.conf', '/etc/pure-ftpd/db/mysql.conf']
for config_file in config_files:
if os.path.exists(config_file):
preFlightsChecks.stdOut(f"Configuring Pure-FTPd: {config_file}")
# Fix MySQL password configuration
command = f"sed -i 's/MYSQLPassword.*/MYSQLPassword cyberpanel/' {config_file}"
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Fix MySQL crypt method for Ubuntu 24.04 compatibility
if self.distro == ubuntu:
import install_utils
try:
release = install_utils.get_Ubuntu_release(use_print=False, exit_on_error=False)
if release and release >= 24.04:
preFlightsChecks.stdOut("Configuring Pure-FTPd for Ubuntu 24.04...")
command = f"sed -i 's/MYSQLCrypt md5/MYSQLCrypt crypt/g' {config_file}"
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
except:
pass
# Start Pure-FTPd service
command = f'systemctl start {ftp_service}'
result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
if result == 1:
# Enable service for auto-start
command = f'systemctl enable {ftp_service}'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Verify service is running
command = f'systemctl is-active {ftp_service}'
try:
output = subprocess.check_output(shlex.split(command)).decode("utf-8").strip()
if output == 'active':
preFlightsChecks.stdOut("Pure-FTPd service started successfully!")
else:
preFlightsChecks.stdOut(f"[WARNING] Pure-FTPd service status: {output}")
# Try to get more details
command = f'systemctl status {ftp_service} --no-pager'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
except:
preFlightsChecks.stdOut("[WARNING] Could not verify Pure-FTPd service status")
def ensureLiteSpeedServicesRunning(self):
"""Ensure LiteSpeed services are running properly"""
preFlightsChecks.stdOut("Ensuring LiteSpeed services are running...")
# Fix LiteSpeed permissions first
self.fixLiteSpeedPermissions()
# Restart LiteSpeed services
litespeed_services = ['lsws', 'lscpd']
for service in litespeed_services:
if subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True).stdout.find(f'{service}.service') != -1:
preFlightsChecks.stdOut(f"Restarting {service}...")
command = f'systemctl restart {service}'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Enable service for auto-start
command = f'systemctl enable {service}'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Verify service is running
command = f'systemctl is-active {service}'
try: try:
output = subprocess.check_output(shlex.split(command)).decode("utf-8").strip() output = subprocess.check_output(shlex.split(command)).decode("utf-8").strip()
if output == 'active': if output == 'active':
preFlightsChecks.stdOut("Pure-FTPd service started successfully!") preFlightsChecks.stdOut(f"{service} is running successfully!")
else: else:
preFlightsChecks.stdOut("[WARNING] Pure-FTPd service may not have started properly. Status: " + output) preFlightsChecks.stdOut(f"[WARNING] {service} status: {output}")
except: except:
preFlightsChecks.stdOut("[WARNING] Could not verify Pure-FTPd service status") preFlightsChecks.stdOut(f"[WARNING] Could not verify {service} status")
def fixLiteSpeedPermissions(self):
"""Fix LiteSpeed directory permissions"""
preFlightsChecks.stdOut("Fixing LiteSpeed permissions...")
litespeed_dirs = ['/usr/local/lsws', '/usr/local/lscp', '/usr/local/CyberCP']
for directory in litespeed_dirs:
if os.path.exists(directory):
command = f'chown -R lscpd:lscpd {directory}'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
command = f'chmod -R 755 {directory}'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
def verifyCriticalServices(self):
"""Verify that all critical services are running"""
preFlightsChecks.stdOut("Verifying critical services...")
critical_services = ['lsws', 'lscpd']
all_services_ok = True
for service in critical_services:
if subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True).stdout.find(f'{service}.service') != -1:
command = f'systemctl is-active {service}'
try:
output = subprocess.check_output(shlex.split(command)).decode("utf-8").strip()
if output == 'active':
preFlightsChecks.stdOut(f"✓ {service} is running")
else:
preFlightsChecks.stdOut(f"✗ {service} is not running (status: {output})")
all_services_ok = False
except:
preFlightsChecks.stdOut(f"✗ Could not verify {service} status")
all_services_ok = False
if all_services_ok:
preFlightsChecks.stdOut("All critical services are running successfully!")
preFlightsChecks.stdOut("CyberPanel should now be accessible at https://your-server-ip:8090")
else:
preFlightsChecks.stdOut("[WARNING] Some critical services are not running properly")
preFlightsChecks.stdOut("Please check the logs and consider running: systemctl restart lsws lscpd")
def configure_jwt_secret(): def configure_jwt_secret():
try: try:

355
plogical/upgrade.py
View File

@@ -3656,7 +3656,7 @@ echo $oConfig->Save() ? 'Done' : 'Error';
@staticmethod @staticmethod
def fixLiteSpeedConfig(): def fixLiteSpeedConfig():
"""Fix LiteSpeed configuration issues by creating missing files""" """Fix LiteSpeed configuration issues by creating missing files and fixing permissions"""
try: try:
Upgrade.stdOut("Checking and fixing LiteSpeed configuration...", 1) Upgrade.stdOut("Checking and fixing LiteSpeed configuration...", 1)
@@ -3665,11 +3665,23 @@ echo $oConfig->Save() ? 'Done' : 'Error';
Upgrade.stdOut("LiteSpeed not found at /usr/local/lsws", 0) Upgrade.stdOut("LiteSpeed not found at /usr/local/lsws", 0)
return return
# Fix LiteSpeed permissions first
Upgrade.stdOut("Fixing LiteSpeed permissions...", 1)
litespeed_dirs = ['/usr/local/lsws', '/usr/local/lscp', '/usr/local/CyberCP']
for directory in litespeed_dirs:
if os.path.exists(directory):
command = f'chown -R lscpd:lscpd {directory}'
Upgrade.executioner(command, f'Fix ownership for {directory}', 0)
command = f'chmod -R 755 {directory}'
Upgrade.executioner(command, f'Fix permissions for {directory}', 0)
# Create missing configuration files # Create missing configuration files
config_files = [ config_files = [
"/usr/local/lsws/conf/httpd_config.xml", "/usr/local/lsws/conf/httpd_config.xml",
"/usr/local/lsws/conf/httpd.conf", "/usr/local/lsws/conf/httpd.conf",
"/usr/local/lsws/conf/modsec.conf" "/usr/local/lscp/conf/httpd_config.xml",
"/usr/local/lscp/conf/httpd.conf"
] ]
for config_file in config_files: for config_file in config_files:
@@ -3694,18 +3706,346 @@ echo $oConfig->Save() ? 'Done' : 'Error';
with open(config_file, 'w') as f: with open(config_file, 'w') as f:
f.write('# Minimal LiteSpeed HTTP configuration\n') f.write('# Minimal LiteSpeed HTTP configuration\n')
f.write('# This file will be updated by CyberPanel\n') f.write('# This file will be updated by CyberPanel\n')
elif config_file.endswith('modsec.conf'):
with open(config_file, 'w') as f: # Set proper permissions
f.write('# ModSecurity configuration\n') os.chmod(config_file, 0o644)
f.write('# This file will be updated by CyberPanel\n') command = f'chown lscpd:lscpd {config_file}'
Upgrade.executioner(command, f'Fix config ownership: {config_file}', 0)
Upgrade.stdOut(f"Created minimal config: {config_file}", 1) Upgrade.stdOut(f"Created minimal config: {config_file}", 1)
else: else:
Upgrade.stdOut(f"LiteSpeed config exists: {config_file}", 1) Upgrade.stdOut(f"LiteSpeed config exists: {config_file}", 1)
# Create PHP socket directory if it doesn't exist
php_sock_dir = '/var/run/php/'
if not os.path.exists(php_sock_dir):
Upgrade.stdOut("Creating PHP socket directory...", 1)
os.makedirs(php_sock_dir, exist_ok=True)
command = f'chmod 755 {php_sock_dir}'
Upgrade.executioner(command, 'Fix PHP socket directory permissions', 0)
# Set ownership based on distribution
osType = Upgrade.decideDistro()
if osType in [Upgrade.centos, Upgrade.cent8, Upgrade.cloudlinux]:
command = f'chown apache:apache {php_sock_dir}'
else:
command = f'chown www-data:www-data {php_sock_dir}'
Upgrade.executioner(command, 'Fix PHP socket directory ownership', 0)
# Restart LiteSpeed services to apply changes
Upgrade.stdOut("Restarting LiteSpeed services...", 1)
litespeed_services = ['lsws', 'lscpd']
for service in litespeed_services:
command = f'systemctl restart {service}'
Upgrade.executioner(command, f'Restart {service}', 0)
command = f'systemctl enable {service}'
Upgrade.executioner(command, f'Enable {service}', 0)
# Verify service is running
command = f'systemctl is-active {service}'
try:
result = subprocess.run(command, shell=True, capture_output=True, text=True)
if result.stdout.strip() == 'active':
Upgrade.stdOut(f"{service} is running successfully", 1)
else:
Upgrade.stdOut(f"{service} status: {result.stdout.strip()}", 0)
except:
Upgrade.stdOut(f"Could not verify {service} status", 0)
except Exception as e: except Exception as e:
Upgrade.stdOut(f"Error fixing LiteSpeed config: {str(e)}", 0) Upgrade.stdOut(f"Error fixing LiteSpeed config: {str(e)}", 0)
@staticmethod
def fixServiceConfiguration():
"""Comprehensive service configuration fix for common 503 error causes"""
try:
Upgrade.stdOut("Applying comprehensive service configuration fixes...", 1)
# Fix PowerDNS configuration
Upgrade.fixPowerDNSConfig()
# Fix Pure-FTPd configuration
Upgrade.fixPureFTPdConfig()
# Fix database connectivity
Upgrade.fixDatabaseConnectivity()
# Fix PHP-FPM services
Upgrade.fixPHPFPMServices()
# Final service restart and verification
Upgrade.restartAndVerifyServices()
except Exception as e:
Upgrade.stdOut(f"Error in service configuration fix: {str(e)}", 0)
@staticmethod
def fixPowerDNSConfig():
"""Fix PowerDNS configuration issues"""
try:
Upgrade.stdOut("Fixing PowerDNS configuration...", 1)
# Check if PowerDNS is installed
if not os.path.exists('/home/cyberpanel/powerdns'):
Upgrade.stdOut("PowerDNS not enabled, skipping...", 1)
return
# Determine correct service name
pdns_service = None
result = subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True)
if 'pdns.service' in result.stdout:
pdns_service = 'pdns'
elif 'powerdns.service' in result.stdout:
pdns_service = 'powerdns'
if not pdns_service:
Upgrade.stdOut("PowerDNS service not found", 0)
return
# Fix PowerDNS configuration files
config_files = ['/etc/pdns/pdns.conf', '/etc/powerdns/pdns.conf']
for config_file in config_files:
if os.path.exists(config_file):
Upgrade.stdOut(f"Configuring PowerDNS: {config_file}", 1)
# Read existing content
with open(config_file, 'r') as f:
content = f.read()
# Add missing configuration if not present
if 'gmysql-password=' not in content:
content += '\ngmysql-password=cyberpanel\n'
if 'launch=' not in content:
content += 'launch=gmysql\n'
# Write back the configuration
with open(config_file, 'w') as f:
f.write(content)
# Set proper permissions
os.chmod(config_file, 0o644)
command = f'chown root:root {config_file}'
Upgrade.executioner(command, f'Fix PowerDNS config ownership', 0)
break
# Restart PowerDNS service
command = f'systemctl restart {pdns_service}'
Upgrade.executioner(command, f'Restart PowerDNS', 0)
command = f'systemctl enable {pdns_service}'
Upgrade.executioner(command, f'Enable PowerDNS', 0)
# Verify service is running
command = f'systemctl is-active {pdns_service}'
result = subprocess.run(command, shell=True, capture_output=True, text=True)
if result.stdout.strip() == 'active':
Upgrade.stdOut("PowerDNS is running successfully", 1)
else:
Upgrade.stdOut(f"PowerDNS status: {result.stdout.strip()}", 0)
except Exception as e:
Upgrade.stdOut(f"Error fixing PowerDNS config: {str(e)}", 0)
@staticmethod
def fixPureFTPdConfig():
"""Fix Pure-FTPd configuration issues"""
try:
Upgrade.stdOut("Fixing Pure-FTPd configuration...", 1)
# Check if Pure-FTPd is installed
if not os.path.exists('/home/cyberpanel/pureftpd'):
Upgrade.stdOut("Pure-FTPd not enabled, skipping...", 1)
return
# Determine correct service name
ftp_service = None
result = subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True)
if 'pure-ftpd.service' in result.stdout:
ftp_service = 'pure-ftpd'
elif 'pureftpd.service' in result.stdout:
ftp_service = 'pureftpd'
if not ftp_service:
Upgrade.stdOut("Pure-FTPd service not found", 0)
return
# Fix Pure-FTPd configuration files
config_files = ['/etc/pure-ftpd/pureftpd-mysql.conf', '/etc/pure-ftpd/db/mysql.conf']
for config_file in config_files:
if os.path.exists(config_file):
Upgrade.stdOut(f"Configuring Pure-FTPd: {config_file}", 1)
# Fix MySQL password configuration
command = f"sed -i 's/MYSQLPassword.*/MYSQLPassword cyberpanel/' {config_file}"
Upgrade.executioner(command, f'Fix Pure-FTPd MySQL password', 0)
# Fix MySQL crypt method for Ubuntu 24.04 compatibility
command = f"sed -i 's/MYSQLCrypt md5/MYSQLCrypt crypt/g' {config_file}"
Upgrade.executioner(command, f'Fix Pure-FTPd MySQL crypt method', 0)
# Set proper permissions
os.chmod(config_file, 0o644)
command = f'chown root:root {config_file}'
Upgrade.executioner(command, f'Fix Pure-FTPd config ownership', 0)
# Restart Pure-FTPd service
command = f'systemctl restart {ftp_service}'
Upgrade.executioner(command, f'Restart Pure-FTPd', 0)
command = f'systemctl enable {ftp_service}'
Upgrade.executioner(command, f'Enable Pure-FTPd', 0)
# Verify service is running
command = f'systemctl is-active {ftp_service}'
result = subprocess.run(command, shell=True, capture_output=True, text=True)
if result.stdout.strip() == 'active':
Upgrade.stdOut("Pure-FTPd is running successfully", 1)
else:
Upgrade.stdOut(f"Pure-FTPd status: {result.stdout.strip()}", 0)
except Exception as e:
Upgrade.stdOut(f"Error fixing Pure-FTPd config: {str(e)}", 0)
@staticmethod
def fixDatabaseConnectivity():
"""Fix database connectivity issues"""
try:
Upgrade.stdOut("Fixing database connectivity...", 1)
# Determine database service name
db_service = None
result = subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True)
if 'mariadb.service' in result.stdout:
db_service = 'mariadb'
elif 'mysql.service' in result.stdout:
db_service = 'mysql'
elif 'mysqld.service' in result.stdout:
db_service = 'mysqld'
if not db_service:
Upgrade.stdOut("Database service not found", 0)
return
# Ensure database service is running
command = f'systemctl restart {db_service}'
Upgrade.executioner(command, f'Restart database service', 0)
command = f'systemctl enable {db_service}'
Upgrade.executioner(command, f'Enable database service', 0)
# Wait for database to be ready
Upgrade.stdOut("Waiting for database to be ready...", 1)
max_attempts = 30
for attempt in range(max_attempts):
try:
result = subprocess.run(['mysqladmin', 'ping', '-h', 'localhost', '--silent'],
capture_output=True)
if result.returncode == 0:
Upgrade.stdOut("Database is ready", 1)
break
except:
pass
time.sleep(2)
# Ensure cyberpanel database exists
try:
result = subprocess.run(['mysql', '-e', 'USE cyberpanel;'], capture_output=True)
if result.returncode != 0:
Upgrade.stdOut("Creating cyberpanel database...", 1)
commands = [
'mysql -e "CREATE DATABASE IF NOT EXISTS cyberpanel;"',
'mysql -e "CREATE USER IF NOT EXISTS \'cyberpanel\'@\'localhost\' IDENTIFIED BY \'cyberpanel\';"',
'mysql -e "GRANT ALL PRIVILEGES ON cyberpanel.* TO \'cyberpanel\'@\'localhost\';"',
'mysql -e "FLUSH PRIVILEGES;"'
]
for cmd in commands:
Upgrade.executioner(cmd, 'Setup cyberpanel database', 0)
except:
Upgrade.stdOut("Could not verify cyberpanel database", 0)
except Exception as e:
Upgrade.stdOut(f"Error fixing database connectivity: {str(e)}", 0)
@staticmethod
def fixPHPFPMServices():
"""Fix PHP-FPM services"""
try:
Upgrade.stdOut("Fixing PHP-FPM services...", 1)
# Get available PHP versions
php_versions = Upgrade.get_available_php_versions()
for version in php_versions:
# Determine FPM service name based on distribution
osType = Upgrade.decideDistro()
if osType in [Upgrade.centos, Upgrade.cent8, Upgrade.cloudlinux]:
fpm_service = f'php{version}-php-fpm'
else:
fpm_service = f'php{version}-fpm'
# Check if service exists and restart it
result = subprocess.run(['systemctl', 'list-unit-files'], capture_output=True, text=True)
if f'{fpm_service}.service' in result.stdout:
Upgrade.stdOut(f"Restarting PHP-FPM {version}...", 1)
command = f'systemctl restart {fpm_service}'
Upgrade.executioner(command, f'Restart PHP-FPM {version}', 0)
command = f'systemctl enable {fpm_service}'
Upgrade.executioner(command, f'Enable PHP-FPM {version}', 0)
# Verify service is running
command = f'systemctl is-active {fpm_service}'
result = subprocess.run(command, shell=True, capture_output=True, text=True)
if result.stdout.strip() == 'active':
Upgrade.stdOut(f"PHP-FPM {version} is running", 1)
else:
Upgrade.stdOut(f"PHP-FPM {version} status: {result.stdout.strip()}", 0)
except Exception as e:
Upgrade.stdOut(f"Error fixing PHP-FPM services: {str(e)}", 0)
@staticmethod
def restartAndVerifyServices():
"""Restart and verify all critical services"""
try:
Upgrade.stdOut("Restarting and verifying critical services...", 1)
# Reload systemd daemon
command = 'systemctl daemon-reload'
Upgrade.executioner(command, 'Reload systemd daemon', 0)
# Restart critical services in order
critical_services = ['lsws', 'lscpd']
all_services_ok = True
for service in critical_services:
Upgrade.stdOut(f"Restarting {service}...", 1)
command = f'systemctl restart {service}'
Upgrade.executioner(command, f'Restart {service}', 0)
command = f'systemctl enable {service}'
Upgrade.executioner(command, f'Enable {service}', 0)
# Verify service is running
command = f'systemctl is-active {service}'
result = subprocess.run(command, shell=True, capture_output=True, text=True)
if result.stdout.strip() == 'active':
Upgrade.stdOut(f"✓ {service} is running successfully", 1)
else:
Upgrade.stdOut(f"✗ {service} is not running (status: {result.stdout.strip()})", 0)
all_services_ok = False
if all_services_ok:
Upgrade.stdOut("All critical services are running successfully!", 1)
Upgrade.stdOut("CyberPanel should now be accessible at https://your-server-ip:8090", 1)
else:
Upgrade.stdOut("Some critical services are not running properly", 0)
Upgrade.stdOut("Please check the logs and consider a server restart", 0)
except Exception as e:
Upgrade.stdOut(f"Error in service verification: {str(e)}", 0)
@staticmethod @staticmethod
def installPHP73(): def installPHP73():
try: try:
@@ -4564,6 +4904,9 @@ slowlog = /var/log/php{version}-fpm-slow.log
# Fix LiteSpeed configuration files if missing # Fix LiteSpeed configuration files if missing
Upgrade.fixLiteSpeedConfig() Upgrade.fixLiteSpeedConfig()
# Fix comprehensive service configuration issues (503 error prevention)
Upgrade.fixServiceConfiguration()
# Fix subdomain log configurations # Fix subdomain log configurations
Upgrade.fixSubdomainLogConfigurations() Upgrade.fixSubdomainLogConfigurations()