From b8f0755b94c9572b1ef53a57587e29c679e48cf3 Mon Sep 17 00:00:00 2001
From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Thu, 12 Oct 2017 12:09:02 +0200
Subject: [PATCH] =?utf8?q?Modifications=C2=A0:=20=20=20=20=20=20=20=20=20e?=
 =?utf8?q?tc/amavis/50-user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 etc/amavis/50-user                         |  5 +++++
 etc/nsd/zone.d/chatperche.org.zone.m4      | 16 ++++++++++++++++
 etc/nsd/zone.d/cyclocoop.org.zone.m4       | 16 ++++++++++++++++
 etc/nsd/zone.d/lesjantesdunord.org.zone.m4 | 16 ++++++++++++++++
 4 files changed, 53 insertions(+)

diff --git a/etc/amavis/50-user b/etc/amavis/50-user
index 1e777e8..b0ea592 100644
--- a/etc/amavis/50-user
+++ b/etc/amavis/50-user
@@ -3,7 +3,9 @@ use strict;
 ## GENERAL
 @local_domains_acl =
  ( ".heureux-cyclage.org"
+ , ".chatperche.org"
  , ".cyclocoop.org"
+ , ".lesjantesdunord.org"
  , ".ptitvelo.net"
  , ".sympa.etudesetchantiers.org"
  , ".sympa.velosenville.org"
@@ -40,7 +42,10 @@ $policy_bank{'Net2Loc'} = {
 	{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } }
  );
 
+dkim_key('chatperche.org', 'chatperche', '/var/lib/amavis/dkim/chatperche.org.pem');
+dkim_key('cyclocoop.org', 'cyclocoop', '/var/lib/amavis/dkim/cyclocoop.org.pem');
 dkim_key('heureux-cyclage.org', 'heureux-cyclage', '/var/lib/amavis/dkim/heureux-cyclage.org.pem');
+dkim_key('lesjantesdunord.org', 'lesjantesdunord', '/var/lib/amavis/dkim/lesjantesdunord.org.pem');
 dkim_key('ptitvelo.net', 'ptitvelo', '/var/lib/amavis/dkim/ptitvelo.net.pem');
 dkim_key('sympa.etudesetchantiers.org', 'sympa', '/var/lib/amavis/dkim/sympa.etudesetchantiers.org.pem');
 dkim_key('sympa.velosenville.org', 'sympa', '/var/lib/amavis/dkim/sympa.velosenville.org.pem');
diff --git a/etc/nsd/zone.d/chatperche.org.zone.m4 b/etc/nsd/zone.d/chatperche.org.zone.m4
index 2e7835b..153f389 100644
--- a/etc/nsd/zone.d/chatperche.org.zone.m4
+++ b/etc/nsd/zone.d/chatperche.org.zone.m4
@@ -77,3 +77,19 @@ _git._tcp.git 18000 IN SRV 0 0 9418 git
 
 ; ENREGISTREMENTS « SSHFP » (Secure SHell FingerPrint)
 esyscmd(sudo ssh-keygen -r @)
+
+; key#1 4096 bits, i=chatperche, d=chatperche.org, /var/lib/amavis/dkim/chatperche.org.pem
+chatperche._domainkey.chatperche.org.   3600 TXT (
+  "v=DKIM1; p="
+  "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2fs+g4rqJKAX6ANOTFcu"
+  "Sf52ZnPYuWWZ28nJHuc7XraJWAwYz6KjWYlY/Q/hwHFVnntOIuBvrDirP+zosM46"
+  "RmScdL/zN1FYvYW6zQ3qJruDzrexCUkgUF2AbURCnuiutj2zlqYSmqizW0l0VWNT"
+  "xFG7w9DDoAvy7bu5Og4D+wWvH7DXaqot9U5yyt0sc5R0DC6jZiWbiAmw0v1qUFde"
+  "HqGWRjtfzZ/TT84sy6bgFd4YW554wQkkcsDcggJW7YqJYBnjvPH0W3zrXEg9dy2s"
+  "9oniEsJhGECIgEPY/GTL3c1Keq05ThVG4Hfhhmrb1HAOlpca5nsqLNrArZ/iD0N9"
+  "NzhU5kLJ9uM99laXCFuz2gtqwVHHBrMuSX0NAFby+EoaUCo9MFS8INWsllxpzT/t"
+  "TUALdLQz7Fh7Ku/A8YM8pW7ln/PEzs80KXpBlBeAxgcWu7eg5yO30iUMUz85QYke"
+  "F4vmWjqxvWeBO3MdXryV5eAIYNeF6+mzwFEUKUb48uxCg7MIglaqhvB3NfnKCzjC"
+  "qv+TW2JwXTUg6yixmYJHQgApEyYMvEYlRTNkX8j6HqR7I8gsy14zdPvtMwkLriI2"
+  "vI1pFJ9lySkyg0Vp0RQFj9bxk9ArjklwoexEJ9PD6gt2ciKRBicLKOLKVywX6jRc"
+  "IBSiZyNCV/eigh/M1eapbusCAwEAAQ==")
diff --git a/etc/nsd/zone.d/cyclocoop.org.zone.m4 b/etc/nsd/zone.d/cyclocoop.org.zone.m4
index 469df86..f7acfcf 100644
--- a/etc/nsd/zone.d/cyclocoop.org.zone.m4
+++ b/etc/nsd/zone.d/cyclocoop.org.zone.m4
@@ -106,3 +106,19 @@ _git._tcp.git 18000 IN SRV 0 0 9418 git
 
 ; ENREGISTREMENTS « SSHFP » (Secure SHell FingerPrint)
 esyscmd(sudo ssh-keygen -r @)
+
+; key#2 4096 bits, i=cyclocoop, d=cyclocoop.org, /var/lib/amavis/dkim/cyclocoop.org.pem
+cyclocoop._domainkey.cyclocoop.org.     3600 TXT (
+  "v=DKIM1; p="
+  "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0hYR4wl1rH+RhuoMBAll"
+  "AkY/YJQbXHQ+0eXGI4THktcNuKuvxuyNXcq+o3Pyz7biJaPSWQW0ZDz20xTvpM31"
+  "4y3xa9ZS5ABeqQA6WayQvxfalF8eaQYA/5hsgO9UlLECzuZNVzhKhW/c1FmQvn+q"
+  "ZaULOjoOdk7TOCQkY6k/WUp/Dgh6lR0ae0a2P8v5mF0+yyO6GCD0mYOh+LVIWpuW"
+  "4Yw8/H7P1chZPEH0BfsBWjyPdCV+LuE8uOAfV1/IX42JFHhk5WufkZAccGHlcvOT"
+  "OlRwywGcVv7l/e3g34/VvSoXRyQnIAcfJ3PjbggOKD4wV37dkS1MSd4DQ5g5nU68"
+  "3Zq36yOWTmkdf/JkFiWZilzhMHtfjK/IhHAXD04h/fTA28qF16tvvMbq4emnIYXo"
+  "qF7w5Lm262Klk3iSDJiuz+XQy5lA+oYKT3UtUe/JycRy/jioTnsRAjyPLYVUkJUu"
+  "1h0eLcEUcvG+HtGfeCo3RCUf5q947ujNk3CzKkGIa/XNu6L5hxT6OQVaeKFXEZk8"
+  "kPLr1FQGfQY07BXai65KukU0Q8VY0HaTdzcDOwuE9tkBlJj4J+gMBikNEiyNrEnn"
+  "OzrypOmanHGp117X1t9CxwXuYBIs788pHtvuJ9UZllKXEmUSl60kyUtnttOqX7Qj"
+  "emmAFmAiiICeYBnefMdMtZ8CAwEAAQ==")
diff --git a/etc/nsd/zone.d/lesjantesdunord.org.zone.m4 b/etc/nsd/zone.d/lesjantesdunord.org.zone.m4
index a77b314..4829682 100644
--- a/etc/nsd/zone.d/lesjantesdunord.org.zone.m4
+++ b/etc/nsd/zone.d/lesjantesdunord.org.zone.m4
@@ -75,3 +75,19 @@ _git._tcp.git 18000 IN SRV 0 0 9418 git
 
 ; ENREGISTREMENTS « SSHFP » (Secure SHell FingerPrint)
 esyscmd(sudo ssh-keygen -r @)
+
+; key#4 4096 bits, i=lesjantesdunord, d=lesjantesdunord.org, /var/lib/amavis/dkim/lesjantesdunord.org.pem
+lesjantesdunord._domainkey.lesjantesdunord.org. 3600 TXT (
+  "v=DKIM1; p="
+  "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAk8Gl2RPdLrbAs5pDxTtd"
+  "FbiikrCHeqhD0WzMDI3eHR46mWzWOpHwsexseE8bComHTr1bTKh3d5ju9MHVcesb"
+  "KB1aTSTsB6PEfV8vpsoBShSLmfGxeo5No3URrIAfcj7KxqiVlMfSHG1QXN+vBfOo"
+  "Yadg9Aw2jEQS94zbpwtu/JUgHpAI3PLIxQZm9WZ8KxpiZG0Z1xa/zJUcxbghdVT2"
+  "7lIaC2CGchN1tXI8Junu/uULxvf+1vILo4xdUCs2nkqEO6+jMdPdKp5N3E9AIQ6N"
+  "pKPpkvWHAEdds7sS1S5dEbsQMiwYZ7Gruy2FLbMAclfO7+00AcsddvVRSEQPHe8K"
+  "wMkrMNhQsNUId3NawkTDjtwr7+ebeJzGDjvFiueBtQ3xsdeO0qEbzcn8tkFTWnj3"
+  "4NNsyN84rfU0dGK4vXuk34P91wIIKDTOOdAps4+gGYzP6SHaQv5k5ewAZypM/Awa"
+  "aizd2e8lGROW5LoNk0zHQ/V+9FOk+y3KDq2pl1gEIs0WUKniCXCzE4kjR7sXuFUX"
+  "qMKlaC1h3eHFhqGDFHNrz/Jv0qGwRtVI1N+6arW9v3aH5JgLbc4ws1oJm3elDysc"
+  "CYICmNdrzuzptBeo1tXGcpzGkcAXm5lE2qjn/BWzrtHnWPLb4GnfxDoxMRNLrYdT"
+  "47/3jEU14db4mEaKAPOpn28CAwEAAQ==")
-- 
2.20.1