mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-12-20 05:11:30 +00:00
[Dovecot] Suppress doveconf -P output on startup
This commit is contained in:
@@ -670,24 +670,20 @@ class BootstrapBase:
|
||||
allowed_chars = string.ascii_letters + string.digits + "_-"
|
||||
return ''.join(secrets.choice(allowed_chars) for _ in range(length))
|
||||
|
||||
def run_command(self, command, check=True, shell=False, input_stream=None):
|
||||
def run_command(self, command, check=True, shell=False, input_stream=None, log_output=True):
|
||||
"""
|
||||
Executes an OS command and optionally checks for errors.
|
||||
Supports piping via input_stream.
|
||||
Executes a shell command and optionally logs output.
|
||||
|
||||
Args:
|
||||
command (str or list): The command to execute.
|
||||
check (bool): Raise CalledProcessError on failure if True.
|
||||
shell (bool): Run in a shell if True.
|
||||
input_stream: A pipe source to use as stdin (e.g. another process's stdout).
|
||||
command (str or list): Command to run.
|
||||
check (bool): Raise if non-zero exit.
|
||||
shell (bool): Run in shell.
|
||||
input_stream: stdin stream.
|
||||
log_output (bool): If True, print output.
|
||||
|
||||
Returns:
|
||||
subprocess.CompletedProcess: The result of the command execution.
|
||||
|
||||
Logs:
|
||||
Prints command output and errors.
|
||||
subprocess.CompletedProcess
|
||||
"""
|
||||
|
||||
try:
|
||||
result = subprocess.run(
|
||||
command,
|
||||
@@ -698,6 +694,7 @@ class BootstrapBase:
|
||||
stderr=subprocess.PIPE,
|
||||
text=True
|
||||
)
|
||||
if log_output:
|
||||
if result.stdout:
|
||||
print(result.stdout.strip())
|
||||
if result.stderr:
|
||||
|
||||
@@ -272,7 +272,7 @@ class Bootstrap(BootstrapBase):
|
||||
"""
|
||||
|
||||
try:
|
||||
result = self.run_command(["doveconf", "-P"], check=True)
|
||||
result = self.run_command(["doveconf", "-P"], check=True, log_output=False)
|
||||
pubkey_path = None
|
||||
for line in result.stdout.splitlines():
|
||||
if "mail_crypt_global_public_key" in line:
|
||||
|
||||
Reference in New Issue
Block a user