cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-20 21:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify resolver fix

Browse Source
This commit is contained in:
ccclxxiii
2026-01-30 22:17:53 +00:00
parent 7d72b0e592
commit c0718325ef
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmdeploy/src/cmdeploy/deployers.py
View File

@@ -550,22 +550,11 @@ def deploy_chatmail(config_path: Path, disable_mail: bool, website_only: bool) -
return return
if host.get_fact(Port, port=53) != "unbound": if host.get_fact(Port, port=53) != "unbound":
server.shell(
name="Ensure resolv.conf ends with newline",
commands=[
"python3 - <<'PY'\n"
"from pathlib import Path\n"
"path = Path('/etc/resolv.conf')\n"
"data = path.read_bytes() if path.exists() else b''\n"
"if data and not data.endswith(b'\\n'):\n"
" path.write_bytes(data + b'\\n')\n"
"PY"
],
)
files.line( files.line(
name="Add 9.9.9.9 to resolv.conf", name="Add 9.9.9.9 to resolv.conf",
path="/etc/resolv.conf", path="/etc/resolv.conf",
line="nameserver 9.9.9.9", # Guard against resolv.conf missing a trailing newline (SolusVM bug).
line="\nnameserver 9.9.9.9",
) )
port_services = [ port_services = [