mirror of
https://github.com/chatmail/relay.git
synced 2026-05-10 16:04:37 +00:00
don't rename import as link2xt prefers
This commit is contained in:
@@ -12,7 +12,7 @@ All functions of this module
|
||||
|
||||
import re
|
||||
|
||||
from .rshell import ShellError, shell
|
||||
from .rshell import CalledProcessError, shell
|
||||
|
||||
|
||||
def perform_initial_checks(mail_domain):
|
||||
@@ -44,7 +44,7 @@ def get_dkim_entry(mail_domain, dkim_selector):
|
||||
f"openssl rsa -in /etc/dkimkeys/{dkim_selector}.private "
|
||||
"-pubout 2>/dev/null | awk '/-/{next}{printf(\"%s\",$0)}'"
|
||||
)
|
||||
except ShellError:
|
||||
except CalledProcessError:
|
||||
return
|
||||
dkim_value_raw = f"v=DKIM1;k=rsa;p={dkim_pubkey};s=email;t=s"
|
||||
dkim_value = '" "'.join(re.findall(".{1,255}", dkim_value_raw))
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
from subprocess import CalledProcessError as ShellError
|
||||
from subprocess import check_output
|
||||
from subprocess import CalledProcessError, check_output
|
||||
|
||||
|
||||
def shell(command, fail_ok=False):
|
||||
print(f"$ {command}")
|
||||
try:
|
||||
return check_output(command, shell=True).decode().rstrip()
|
||||
except ShellError:
|
||||
except CalledProcessError:
|
||||
if not fail_ok:
|
||||
raise
|
||||
return ""
|
||||
|
||||
Reference in New Issue
Block a user