From e372599ce70901442e9ce6c04597662601a06f70 Mon Sep 17 00:00:00 2001 From: Christian Hagenest Date: Thu, 11 Apr 2024 18:43:33 +0200 Subject: [PATCH] change location of changes per nami's recommendation --- cmdeploy/src/cmdeploy/__init__.py | 36 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index 43de281d..ab7006d1 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -483,6 +483,23 @@ def deploy_chatmail(config_path: Path) -> None: commands=["test -d /home/vmail && chown -R vmail:vmail /home/vmail"], ) + # Add our OBS repository for dovecot_no_delay + files.put( + name = "Add Deltachat OBS GPG key to apt keyring", + src = importlib.resources.files(__package__).joinpath("obs-home-deltachat.gpg"), + dest = "/etc/apt/keyrings/obs-home-deltachat.gpg", + user="root", + group="root", + mode="644", + ) + + files.line( + name = "Add DeltaChat OBS home repository to sources.list", + path = "/etc/apt/sources.list", + line = "deb [signed-by=/etc/apt/keyrings/obs-home-deltachat.gpg] https://download.opensuse.org/repositories/home:/deltachat/Debian_12/ ./", + ensure_newline = True, + ) + apt.update(name="apt update", cache_time=24 * 3600) apt.packages( @@ -522,25 +539,6 @@ def deploy_chatmail(config_path: Path) -> None: packages="postfix", ) - # Add our OBS repository for dovecot_no_delay - files.put( - name = "Add Deltachat OBS GPG key to apt keyring", - src = importlib.resources.files(__package__).joinpath("obs-home-deltachat.gpg"), - dest = "/etc/apt/keyrings/obs-home-deltachat.gpg", - user="root", - group="root", - mode="644", - ) - - files.line( - name = "Add DeltaChat OBS home repository to sources.list", - path = "/etc/apt/sources.list", - line = "deb [signed-by=/etc/apt/keyrings/obs-home-deltachat.gpg] https://download.opensuse.org/repositories/home:/deltachat/Debian_12/ ./", - ensure_newline = True, - ) - - apt.update(name="apt update") - apt.packages( name="Install Dovecot", packages=["dovecot-imapd", "dovecot-lmtpd", "dovecot-sieve"],