Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-10-31 18:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

debian 12

Browse Source
This commit is contained in:
usmannasir
2025-09-18 12:30:22 +05:00
parent b0ef10ba9d
commit 3ae4be91af
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
install/install.py
View File

@@ -78,6 +78,13 @@ class preFlightsChecks:
"""Check if distro is Ubuntu or Debian 12""" """Check if distro is Ubuntu or Debian 12"""
return self.distro in [ubuntu, debian12] return self.distro in [ubuntu, debian12]
def get_service_name(self, service):
"""Get the correct service name for the current distribution"""
service_map = {
'pdns': 'pdns-server' if self.distro == debian12 else 'pdns'
}
return service_map.get(service, service)
def manage_service(self, service_name, action="start"): def manage_service(self, service_name, action="start"):
"""Unified service management""" """Unified service management"""
command = f'systemctl {action} {service_name}' command = f'systemctl {action} {service_name}'
@@ -2456,10 +2463,11 @@ milter_default_action = accept
if state == 'off': if state == 'off':
command = 'sudo systemctl stop pdns' pdns_service = self.get_service_name('pdns')
command = f'sudo systemctl stop {pdns_service}'
subprocess.call(shlex.split(command)) subprocess.call(shlex.split(command))
command = 'sudo systemctl disable pdns' command = f'sudo systemctl disable {pdns_service}'
subprocess.call(shlex.split(command)) subprocess.call(shlex.split(command))
try: try:
@@ -2709,12 +2717,13 @@ vmail
# 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...") preFlightsChecks.stdOut("Starting PowerDNS service...")
command = 'systemctl start pdns' 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) result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
if result == 1: if result == 1:
# Check if service started successfully # Check if service started successfully
command = 'systemctl is-active pdns' command = f'systemctl is-active {pdns_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':

2
install/installCyberPanel.py
View File

@@ -119,7 +119,7 @@ class InstallCyberPanel:
service_map = { service_map = {
'mariadb': 'mariadb', 'mariadb': 'mariadb',
'pureftpd': 'pure-ftpd-mysql' if self.distro == ubuntu else 'pure-ftpd', 'pureftpd': 'pure-ftpd-mysql' if self.distro == ubuntu else 'pure-ftpd',
'pdns': 'pdns' 'pdns': 'pdns-server' if self.distro == debian12 else 'pdns'
} }
actual_service = service_map.get(service_name, service_name) actual_service = service_map.get(service_name, service_name)

8
install/install_utils.py
View File

@@ -139,7 +139,9 @@ def get_debian_mariadb_packages():
'python-minimal': '', # Not needed in newer versions 'python-minimal': '', # Not needed in newer versions
'python-gpg': 'python3-gpg', 'python-gpg': 'python3-gpg',
'python': 'python3', 'python': 'python3',
'dovecot-pigeonhole': 'dovecot-sieve' 'dovecot-pigeonhole': 'dovecot-sieve',
'pdns': 'pdns-server',
'pdns-backend-mysql': 'pdns-backend-mysql'
} }
elif debian_version >= 12.0: elif debian_version >= 12.0:
# Debian 12 (Bookworm) # Debian 12 (Bookworm)
@@ -152,7 +154,9 @@ def get_debian_mariadb_packages():
'python-minimal': '', 'python-minimal': '',
'python-gpg': 'python3-gpg', 'python-gpg': 'python3-gpg',
'python': 'python3', 'python': 'python3',
'dovecot-pigeonhole': 'dovecot-sieve' 'dovecot-pigeonhole': 'dovecot-sieve',
'pdns': 'pdns-server',
'pdns-backend-mysql': 'pdns-backend-mysql'
} }
else: else:
# Older Debian versions (11 and below) # Older Debian versions (11 and below)