From 4e0b025477530b57bdef86daec2625c7029d030a Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 9 May 2023 18:30:16 +0200 Subject: [PATCH 1/2] added missing packages Thanks to @ruslaan7 --- modoboa_installer/scripts/modoboa.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 97b926c..838d1b5 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -26,7 +26,8 @@ class Modoboa(base.Installer): "deb": [ "build-essential", "python3-dev", "libxml2-dev", "libxslt-dev", "libjpeg-dev", "librrd-dev", "rrdtool", "libffi-dev", "cron", - "libssl-dev", "redis-server", "supervisor" + "libssl-dev", "redis-server", "supervisor", "pkg-config", + "libcairo2-dev" ], "rpm": [ "gcc", "gcc-c++", "python3-devel", "libxml2-devel", "libxslt-devel", From 2873a5ae69d1a86f0f4b2a899eab14b4cdea0580 Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 9 May 2023 19:34:22 +0200 Subject: [PATCH 2/2] Updated automx config --- modoboa_installer/scripts/automx.py | 4 ++-- .../scripts/files/automx/automx.conf.tpl | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modoboa_installer/scripts/automx.py b/modoboa_installer/scripts/automx.py index 3e7d3b1..9267500 100644 --- a/modoboa_installer/scripts/automx.py +++ b/modoboa_installer/scripts/automx.py @@ -44,12 +44,12 @@ class Automx(base.Installer): sql_query = ( "SELECT first_name || ' ' || last_name AS display_name, email" ", SPLIT_PART(email, '@', 2) AS domain " - "FROM core_user WHERE email='%s' AND is_active") + "FROM core_user WHERE email='%s' AND is_active;") else: sql_query = ( "SELECT concat(first_name, ' ', last_name) AS display_name, " "email, SUBSTRING_INDEX(email, '@', -1) AS domain " - "FROM core_user WHERE email='%s' AND is_active=1" + "FROM core_user WHERE email='%s' AND is_active=1;" ) context.update({"sql_dsn": sql_dsn, "sql_query": sql_query}) return context diff --git a/modoboa_installer/scripts/files/automx/automx.conf.tpl b/modoboa_installer/scripts/files/automx/automx.conf.tpl index 61cc835..1fd4838 100644 --- a/modoboa_installer/scripts/files/automx/automx.conf.tpl +++ b/modoboa_installer/scripts/files/automx/automx.conf.tpl @@ -2,6 +2,9 @@ provider = %domain domains = * +#debug=yes +#logfile = /srv/automx/automx.log + # Protect against DoS memcache = 127.0.0.1:11211 memcache_ttl = 600 @@ -16,6 +19,8 @@ host = %sql_dsn query = %sql_query result_attrs = display_name, email +display_name = ${display_name} + smtp = yes smtp_server = %hostname smtp_port = 587 @@ -32,10 +37,3 @@ imap_encryption = starttls imap_auth = plaintext imap_auth_identity = ${email} imap_refresh_ttl = 6 - -pop = yes -pop_server = %hostname -pop_port = 110 -pop_encryption = starttls -pop_auth = plaintext -pop_auth_identity = ${email}