diff options
| author | ng <ng@immerda.ch> | 2023-09-08 13:38:52 +0000 |
|---|---|---|
| committer | ng <ng@immerda.ch> | 2023-09-08 13:38:52 +0000 |
| commit | a33b3d70dc17ebadf8cd3ba5552af1fa7b2647db (patch) | |
| tree | e15a3b9fe47b04c0a270b64c2405691207638f6d | |
| parent | 34d83dd33254a77bda3d608b0b14a5bd3ec0e7bd (diff) | |
| parent | 439db2b1dcdb2f0d52d6b85f19087a45f59f270a (diff) | |
Merge branch 'fix/exim_config_tainted' into 'main'
fix exim config example
See merge request schleuder/schleuder-website!114
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | schleuder/docs/server-admins.md | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4fd2ee9..8a147cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,8 @@ deploy: - chmod 700 ~/.ssh - printf " |1|ZfxGVbfwfCHlaURlet/V6y+2gjg=|/X7OweXQUnXZnGSKkvF/IpVz4n4= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPJx38PfGvaHtkSsHptiHoIQxlI3Yf0cskPNTwAQnY14\n - |1|8YPsezXF2SYQ7rq9U5TbDnMsVjo=|SJOodZB+8j+dO+l6YTdZ7+44XLw= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPJx38PfGvaHtkSsHptiHoIQxlI3Yf0cskPNTwAQnY14 + |1|8YPsezXF2SYQ7rq9U5TbDnMsVjo=|SJOodZB+8j+dO+l6YTdZ7+44XLw= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPJx38PfGvaHtkSsHptiHoIQxlI3Yf0cskPNTwAQnY14\n + ftp.schleuder.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMipvUM0/aLT4LXkqehXRURN5JHvhz1+9pfuIj7y7LRG " > ~/.ssh/known_hosts - tar fxv site.tar.gz # In case we're not dealing with the main branch, create the review dir on the webserver. diff --git a/schleuder/docs/server-admins.md b/schleuder/docs/server-admins.md index 1c38404..8bcf2c5 100644 --- a/schleuder/docs/server-admins.md +++ b/schleuder/docs/server-admins.md @@ -171,11 +171,11 @@ Within the `begin routers` section of your `exim.conf` you can add the following mlschleuder: driver = accept - condition = ${lookup {$local_part@$domain}lsearch{/etc/exim/schleuder-lists} {yes}{no}} + require_files = /etc/exim/schleuder-lists + address_data = ${lookup {$local_part@$domain} lsearch,ret=key {/etc/exim/schleuder-lists} {$value} fail} local_part_suffix_optional local_part_suffix = +* : -bounce : -sendkey : -request : -owner transport = mlschleuder_transport_local - no_more `/etc/exim/schleuder-lists` is a simple textfile containing one list-address per line. You can for example create it by executing `schleuder-cli lists list > /etc/exim/schleuder-lists` after creating or deleting any lists. In more advanced setups you might have different conditions depending on how you manage the inventory of your schleuder lists and decide to accept a mail for a list. @@ -187,8 +187,8 @@ Within the `begin transports` section of your `exim.conf` you then configure the group = schleuder # schleuders generates nice log messages for some of the problems return_fail_output = true - home_directory = /var/lib/schleuder/lists/$domain/$local_part - command = "/usr/bin/schleuder work $local_part$local_part_suffix@$domain" + home_directory = /var/lib/schleuder/lists/${domain:$address_data}/${local_part:$address_data} + command = "/usr/bin/schleuder work ${local_part:$address_data}${local_part_suffix}@${domain:$address_data}" message_size_limit = 10M Please note that we keep the `$local_part_suffix` when handing the mail over to schleuder, so schleuder can e.g. detect bounces or sendkey emails properly. |