From d15c22c1e8a9d14d557a5823d4c85b70abde15b1 Mon Sep 17 00:00:00 2001 From: link2xt Date: Thu, 28 Mar 2024 19:07:28 +0000 Subject: [PATCH] Configure users and groups before installing any packages Otherwise packages may add user without correct configuration such as groups and the step adding user will be skipped. --- cmdeploy/src/cmdeploy/__init__.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index cb328255..419391e1 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -135,20 +135,6 @@ def _configure_opendkim(domain: str, dkim_selector: str = "dkim") -> bool: """Configures OpenDKIM""" need_restart = False - server.group(name="Create opendkim group", group="opendkim", system=True) - server.user( - name="Create opendkim user", - user="opendkim", - groups=["opendkim"], - system=True, - ) - server.user( - name="Add postfix user to opendkim group for socket access", - user="postfix", - groups=["opendkim"], - system=True, - ) - main_config = files.template( src=importlib.resources.files(__package__).joinpath("opendkim/opendkim.conf"), dest="/etc/opendkim.conf", @@ -476,9 +462,24 @@ def deploy_chatmail(config_path: Path) -> None: from .www import build_webpages - apt.update(name="apt update", cache_time=24 * 3600) server.group(name="Create vmail group", group="vmail", system=True) server.user(name="Create vmail user", user="vmail", group="vmail", system=True) + server.group(name="Create opendkim group", group="opendkim", system=True) + server.user( + name="Create opendkim user", + user="opendkim", + groups=["opendkim"], + system=True, + ) + server.user( + name="Add postfix user to opendkim group for socket access", + user="postfix", + groups=["opendkim"], + system=True, + ) + + apt.update(name="apt update", cache_time=24 * 3600) + apt.packages( name="Install rsync", packages=["rsync"],