From c7876029a9b6c8054642db0315ec1a27efcf42bb Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Fri, 25 Feb 2022 17:59:06 +0100
Subject: [PATCH] Move custom rewrites to postfix

---
 Readme.md                                 | 5 +++--
 docker-compose.yml                        | 1 +
 docker/postfix/etc/postfix/main.cf.append | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index f702914..1b8e630 100644
--- a/Readme.md
+++ b/Readme.md
@@ -39,7 +39,8 @@ graph LR
 
 ## Enable sending mails
 
-You need to add `sympa_rewrite`, `custom_rewrites` and `sympa_transport`  files to `sympa/shared/` directory:
+You need to add `sympa_rewrite`, and `sympa_transport`  files to `sympa/shared/` directory:
+And `rewrites` to file `postfix/custom`
 
 Example of a `sympa_rewrite` file:
 
@@ -49,7 +50,7 @@ Example of a `sympa_rewrite` file:
 /(.+)-owner@(.+)/	$1+owner@$2
 ```
 
-`custom_rewrites` can be empty, it should be used if you need to add someother aliases
+`postfix/custom/rewrites` can be empty, it should be used if you need to add someother aliases
 
 Example of a `sympa_transport` file, for each domain you have Sympa providing mailing lists:
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 4032968..2a71993 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,6 +38,7 @@ services:
       - "./sympa/sympa/shared:/etc/sympa/shared"
       - "./postfix/rsyslog:/etc/rsyslog.d1/"
       - "./postfix/dkim:/etc/dkimkeys/"
+      - "./postfix/custom:/etc/postfix/custom"
       - "./log/postfix:/var/log/postfix"
       - "spool_postfix:/var/spool/postfix"
     networks:
diff --git a/docker/postfix/etc/postfix/main.cf.append b/docker/postfix/etc/postfix/main.cf.append
index 7233a79..cbc02bf 100644
--- a/docker/postfix/etc/postfix/main.cf.append
+++ b/docker/postfix/etc/postfix/main.cf.append
@@ -13,7 +13,7 @@ virtual_mailbox_base = /tmp
 virtual_alias_maps =
   regexp:/etc/postfix/global_alias
   regexp:/etc/sympa/shared/sympa_rewrite
-  regexp:/etc/sympa/shared/custom_rewrites
+  regexp:/etc/postfix/custom/rewrites
 transport_maps =
   regexp:/etc/sympa/shared/sympa_transport
 
-- 
GitLab