From ecbf1355499060499dd6282958faec228307c9fe Mon Sep 17 00:00:00 2001 From: missytake Date: Tue, 26 Dec 2023 10:22:44 +0100 Subject: [PATCH] rspamd: install rspamd + redis --- cmdeploy/src/cmdeploy/__init__.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index 22b0be3d..bb977097 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -392,6 +392,11 @@ def _configure_rspamd(dkim_selector: str, mail_domain: str) -> bool: """Configures rspamd for Rate Limiting.""" need_restart = False + apt.packages( + name="apt install rspamd", + packages="rspamd", + ) + phishing_conf = files.put( name="disable phishing rspamd plugin", src=importlib.resources.files(__package__).joinpath("rspamd/phishing.conf"), @@ -496,6 +501,11 @@ def _configure_redis() -> bool: """Configures redis as a key-value storage for rspamd.""" need_restart = False + apt.packages( + name="apt install redis-server", + packages="redis-server", + ) + redis_config = files.put( src=importlib.resources.files(__package__).joinpath("rspamd/redis.conf"), dest="/etc/redis/redis.conf", @@ -610,8 +620,8 @@ def deploy_chatmail(config_path: Path) -> None: nginx_need_restart = _configure_nginx(mail_domain) remove_opendkim() - rspamd_need_restart = _configure_rspamd("dkim", mail_domain) redis_need_restart = _configure_redis() + rspamd_need_restart = _configure_rspamd("dkim", mail_domain) systemd.service( name="Start and enable redis-server",