From 24bba54445e0a7c17a50ddce05e31f12f4cf4e10 Mon Sep 17 00:00:00 2001 From: Hendrik Jäger Date: Thu, 7 Sep 2023 14:59:11 +0200 Subject: exim config example: 'no_more' would cause the router to decline, so order of routers becomes important --- schleuder/docs/server-admins.md | 1 - 1 file changed, 1 deletion(-) diff --git a/schleuder/docs/server-admins.md b/schleuder/docs/server-admins.md index 1c38404..ed28bc0 100644 --- a/schleuder/docs/server-admins.md +++ b/schleuder/docs/server-admins.md @@ -175,7 +175,6 @@ Within the `begin routers` section of your `exim.conf` you can add the following 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. -- cgit v1.2.3 From 04bbb69494521d656bd312d73aeda849c0e71cfc Mon Sep 17 00:00:00 2001 From: Hendrik Jäger Date: Thu, 7 Sep 2023 15:04:22 +0200 Subject: exim config example: untainting user input --- schleuder/docs/server-admins.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/schleuder/docs/server-admins.md b/schleuder/docs/server-admins.md index ed28bc0..8bcf2c5 100644 --- a/schleuder/docs/server-admins.md +++ b/schleuder/docs/server-admins.md @@ -171,7 +171,8 @@ 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 @@ -186,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. -- cgit v1.2.3 From 439db2b1dcdb2f0d52d6b85f19087a45f59f270a Mon Sep 17 00:00:00 2001 From: paz Date: Fri, 8 Sep 2023 09:58:07 +0200 Subject: Add new key of deploy-host to CI config --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3