Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-02-16 19:46:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Install logs: show paths at start and on completion; dns-one path fix; shell/composer fixes; doc install log locations

Browse Source
This commit is contained in:
master3395
2026-02-04 23:58:43 +01:00
parent 0ebe9aed81
commit 00dedf49d1
4 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install/install.py
View File

@@ -2258,10 +2258,11 @@ module cyberpanel_ols {
if e.errno != errno.EEXIST:
raise
# Copy the PowerDNS configuration file
# Copy the PowerDNS configuration file (cwd may be temp dir with install/ subdir when run from cyberpanel.sh)
source_file = os.path.join(self.cwd, "dns-one", "pdns.conf")
if not os.path.exists(source_file):
# Try alternative location
source_file = os.path.join(self.cwd, "install", "dns-one", "pdns.conf")
if not os.path.exists(source_file):
source_file = os.path.join(self.cwd, "dns", "pdns.conf")
if os.path.exists(source_file):
@@ -6250,8 +6251,10 @@ vmail
dnsPath = "/etc/powerdns/pdns.conf"
os.makedirs("/etc/powerdns", exist_ok=True)
# Copy the PowerDNS configuration file
# Copy the PowerDNS configuration file (cwd may be temp dir with install/ subdir)
source_file = os.path.join(self.cwd, "dns-one", "pdns.conf")
if not os.path.exists(source_file):
source_file = os.path.join(self.cwd, "install", "dns-one", "pdns.conf")
if not os.path.exists(source_file):
source_file = os.path.join(self.cwd, "dns", "pdns.conf")

13
install/install_utils.py
View File

@@ -558,6 +558,15 @@ def call(command, distro, bracket, message, log=0, do_exit=0, code=os.EX_OK, she
if os.path.isfile(fallback):
command = command.replace(bad_path, fallback)
shell = True
# Use /tmp/composer.sh when command references relative composer.sh (avoids "chmod: cannot access 'composer.sh'")
# Only replace local file refs, not URLs (e.g. https://cyberpanel.sh/composer.sh)
if not os.path.isfile(os.path.join(os.getcwd(), 'composer.sh')):
if './composer.sh' in command:
command = command.replace('./composer.sh', '/tmp/composer.sh')
shell = True
elif ' composer.sh' in command and 'http' not in command.split('composer.sh')[0][-20:]:
command = command.replace(' composer.sh', ' /tmp/composer.sh')
shell = True
# Check for apt lock before running apt commands
if 'apt-get' in command or 'apt ' in command:
@@ -568,8 +577,8 @@ def call(command, distro, bracket, message, log=0, do_exit=0, code=os.EX_OK, she
return False
# CRITICAL: Use shell=True for commands with shell metacharacters
# Avoids "No matching repo to modify: 2>/dev/null, true, ||" when shlex.split splits them
if not shell and any(x in command for x in (' || ', ' 2>/dev', ' 2>', ' | ', '; true', '|| true')):
# Avoids "No matching repo to modify: 2>/dev/null, true, ||" and "Could not resolve host: |" when shlex.split splits them
if not shell and (any(x in command for x in (' || ', ' 2>/dev', ' 2>', ' | ', '; true', '|| true')) or '|' in command):
shell = True
# CRITICAL: For mysql/mariadb commands, always use shell=True and full binary path