From 62e0202beca4be0a82a6c818dcbd0e614273c497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Thu, 1 Oct 2015 22:07:49 +0200
Subject: [PATCH] Typos sur les configs dkim

---
 Bundler/dkim.xml |  2 +-
 Rules/dkim.xml   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Bundler/dkim.xml b/Bundler/dkim.xml
index a5800a6..deac030 100644
--- a/Bundler/dkim.xml
+++ b/Bundler/dkim.xml
@@ -3,7 +3,7 @@
 
     <Service name="opendkim"/>
 
-    <Path name="/etc/opendkim/opendkim.conf"/>
+    <Path name="/etc/opendkim.conf"/>
     <Path name="/etc/opendkim/KeyTable"/>
     <Path name="/etc/opendkim/SigningTable"/>
     <Path name="/etc/opendkim/TrustedHosts"/>
diff --git a/Rules/dkim.xml b/Rules/dkim.xml
index b0f78f0..b43f23a 100644
--- a/Rules/dkim.xml
+++ b/Rules/dkim.xml
@@ -2,15 +2,10 @@
 <Rules priority="1">
     <Service type="deb" name="opendkim" status="on"/>
 
-    <Path name="/etc/opendkim/opendkim.conf"/>
-    <Path name="/etc/opendkim/KeyTable"/>
-    <Path name="/etc/opendkim/SigningTable"/>
-    <Path name="/etc/opendkim/TrustedHosts"/>
-
-    <Path type="directory" name="/etc/opendkim/" owner="dkim" group="dkim" mode="0775"/>
-    <Path type="directory" name="/etc/opendkim/keys" owner="dkim" group="dkim" mode="0750"/>
+    <Path type="directory" name="/etc/opendkim/" owner="opendkim" group="opendkim" mode="0775"/>
+    <Path type="directory" name="/etc/opendkim/keys" owner="opendkim" group="opendkim" mode="0750"/>
 
     <Action name="dkim-echo" timing="post"
         when="modified" status="check"
-        command="bash -c 'echo Vous devez mettre en place la clef publique et la clef privée pour opendkim. Pensez à les chmod/chown correctement, et n'oubliez pas de vérifier que tout est bon côté DNS. Appuyez sur entree quand vous avez fini. && read'"/>
+        command="echo Pensez à mettre en place les clefs pour opendkim et à vérifier les entrées DNS idoines."/>
 </Rules>