diff --git a/cmdeploy/src/cmdeploy/acmetool/__init__.py b/cmdeploy/src/cmdeploy/acmetool/__init__.py index e4e1ed84..e0e8c02f 100644 --- a/cmdeploy/src/cmdeploy/acmetool/__init__.py +++ b/cmdeploy/src/cmdeploy/acmetool/__init__.py @@ -67,7 +67,7 @@ class AcmetoolDeployer(Deployer): ) files.template( src=importlib.resources.files(__package__).joinpath("desired.yaml.j2"), - dest=f"/var/lib/acme/desired/{self.domains[0]}", # 0 is mailhost TLD + dest=f"/var/lib/acme/desired/{self.domains[0]}", # 0 is mailhost TLD user="root", group="root", mode="644", diff --git a/cmdeploy/src/cmdeploy/dovecot/deployer.py b/cmdeploy/src/cmdeploy/dovecot/deployer.py index bb3bd764..2e9bf5b6 100644 --- a/cmdeploy/src/cmdeploy/dovecot/deployer.py +++ b/cmdeploy/src/cmdeploy/dovecot/deployer.py @@ -42,7 +42,9 @@ class DovecotDeployer(Deployer): restart = False if self.disable_mail else self.need_restart systemd.service( - name="Disable dovecot for now" if self.disable_mail else "Start and enable Dovecot", + name="Disable dovecot for now" + if self.disable_mail + else "Start and enable Dovecot", service="dovecot.service", running=False if self.disable_mail else True, enabled=False if self.disable_mail else True, diff --git a/cmdeploy/src/cmdeploy/postfix/deployer.py b/cmdeploy/src/cmdeploy/postfix/deployer.py index 96197bd7..f18f3e4e 100644 --- a/cmdeploy/src/cmdeploy/postfix/deployer.py +++ b/cmdeploy/src/cmdeploy/postfix/deployer.py @@ -97,7 +97,9 @@ class PostfixDeployer(Deployer): server.shell( name="Validate postfix configuration", # Extract stderr and quit with error if non-zero - commands=["""bash -c 'w=$(postconf 2>&1 >/dev/null); [[ -z "$w" ]] || { echo "$w"; false; }'"""], + commands=[ + """bash -c 'w=$(postconf 2>&1 >/dev/null); [[ -z "$w" ]] || { echo "$w"; false; }'""" + ], ) self.need_restart = need_restart