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

Revert "pyinfra: only install unbound-anchor on Debian systems"

Browse Source 
This reverts commit c1d3de926e.
This commit is contained in:
missytake
2023-12-19 17:31:34 +01:00
parent 7a2a889585
commit 0ffe4d4996
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmdeploy/src/cmdeploy/__init__.py
View File

@@ -12,7 +12,6 @@ from pyinfra import host
from pyinfra.operations import apt, files, server, systemd, pip from pyinfra.operations import apt, files, server, systemd, pip
from pyinfra.facts.files import File from pyinfra.facts.files import File
from pyinfra.facts.systemd import SystemdEnabled from pyinfra.facts.systemd import SystemdEnabled
from pyinfra.facts.server import LinuxDistribution
from .acmetool import deploy_acmetool from .acmetool import deploy_acmetool
from chatmaild.config import read_config, Config from chatmaild.config import read_config, Config
@@ -400,18 +399,12 @@ def deploy_chatmail(config_path: Path) -> None:
# to use 127.0.0.1 as the resolver. # to use 127.0.0.1 as the resolver.
apt.packages( apt.packages(
name="Install unbound", name="Install unbound",
packages=["unbound"], packages=["unbound", "unbound-anchor"],
)
server.shell(
name="Generate root keys for validating DNSSEC",
commands=["unbound-anchor -a /var/lib/unbound/root.key || true"],
) )
if host.get_fact(LinuxDistribution).get("name") == "Debian":
# on Debian, the root key doesn't seem to be auto-generated during apt install unbound.
apt.packages(
name="Install unbound-anchor for generating DNSSEC validation root key",
packages=["unbound-anchor"],
)
server.shell(
name="Generate root keys for validating DNSSEC",
commands=["unbound-anchor -a /var/lib/unbound/root.key || true"],
)
systemd.service( systemd.service(
name="Start and enable unbound", name="Start and enable unbound",
service="unbound.service", service="unbound.service",