From a32fe2589ab541e25495632e9d04af4fcd8d058b Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 22 Jun 2013 16:34:18 +0200
Subject: [PATCH] =?UTF-8?q?[secrets]=20Mise=20=C3=A0=20jour=20des=20permis?=
 =?UTF-8?q?sions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Supression de rouge, alc sur dhcp.py
---
 Python/etc/crans/secrets/dhcp.py    | 4 ++++
 Python/etc/crans/secrets/secrets.py | 3 ---
 Rules/secrets.xml                   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Python/etc/crans/secrets/dhcp.py b/Python/etc/crans/secrets/dhcp.py
index cd4571f..c8d16d4 100644
--- a/Python/etc/crans/secrets/dhcp.py
+++ b/Python/etc/crans/secrets/dhcp.py
@@ -1,4 +1,8 @@
 info["perms"] = 0440
+if has("users") or has("2B"):
+    info["owner"] = "respbats"
+else:
+    info["owner"] = "root"
 info["group"] = "adm"
 import dhcp
 
diff --git a/Python/etc/crans/secrets/secrets.py b/Python/etc/crans/secrets/secrets.py
index 23508c8..84f26ca 100644
--- a/Python/etc/crans/secrets/secrets.py
+++ b/Python/etc/crans/secrets/secrets.py
@@ -1,9 +1,6 @@
 info["perms"] = 0440
 if has("users") or has("2B"):
     info["owner"] = "respbats"
-elif has("rouge"):
-    # XXX: kludge pour facture.py (paypal)
-    info["owner"] = "intranet"
 else:
     info["owner"] = "root"
 info["group"] = "adm"
diff --git a/Rules/secrets.xml b/Rules/secrets.xml
index 24da192..71c1204 100644
--- a/Rules/secrets.xml
+++ b/Rules/secrets.xml
@@ -3,6 +3,6 @@
   <Group name="secrets-acl">
    <Action name="setfacl-secrets" timing="post"
      when="modified" status="check"
-     command="setfacl -m u:www-data:rx /etc/crans/secrets; setfacl -m u:www-data:r /etc/crans/secrets/secrets.py"/>
+     command="setfacl -m u:www-data:rx /etc/crans/secrets; setfacl -m u:www-data:r /etc/crans/secrets/secrets.py /etc/crans/secrets/dhcp.py"/>
   </Group>
 </Rules>