From d10a8a0672ec59ef21b604831e980acfd1026e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?=
 <Pierre-Elliott.Becue@crans.org>
Date: Tue, 11 Dec 2012 11:01:27 +0100
Subject: [PATCH] [Bcfg2] Nouveau paquet, nouvelle config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: 67cdee8f32d7581493d12617ddc97bc2
Bcfg2 a subi deux releases, qui ont pas mal changé les "normes".

Les balises suivntes sont remplacées :

<ConfigFile> ---------------------------> <Path type="file">
<Directory>  ---------------------------> <Path type="directory">
<SymLink>    ---------------------------> <Path type="symlink">
etc

Pour les fichiers python, désormais, on utilise plus
<ConfigFile>, mais <Python>

darcs-hash:20121211100127-b6762-f146f4460e9713cb59a25c33a08b551c5280f3b2.gz
---
 Base/cron.xml                          |  6 +--
 Base/dom0.xml                          | 56 +++++++++++++-------------
 Base/needed.xml                        | 38 ++++++++---------
 Bundler/apt-keys.xml                   | 13 +++---
 Bundler/apt-listchanges.xml            |  5 +--
 Bundler/apt-mirror.xml                 | 12 +++---
 Bundler/apt.xml                        |  6 +--
 Bundler/arpwatch.xml                   |  4 +-
 Bundler/attendre-vert.xml              |  4 +-
 Bundler/autostatus.xml                 |  4 +-
 Bundler/backuppc.xml                   |  4 +-
 Bundler/bcfg2.xml                      |  9 +++--
 Bundler/bind.xml                       | 16 ++++----
 Bundler/corbeau.xml                    |  6 +--
 Bundler/debconf.xml                    |  5 +--
 Bundler/ejabberd-extra.xml             |  6 +--
 Bundler/ejabberd-services.xml          |  6 +--
 Bundler/home.xml                       |  6 +--
 Bundler/jabberd.xml                    | 24 +++++------
 Bundler/ldap.xml                       |  4 +-
 Bundler/locale-generation.xml          |  5 +--
 Bundler/locale.xml                     |  7 ++--
 Bundler/logcheck.xml                   | 10 ++---
 Bundler/molly-guard.xml                |  2 +-
 Bundler/monit.xml                      | 10 ++---
 Bundler/mumudvb.xml                    |  4 +-
 Bundler/munin-node.xml                 |  9 ++---
 Bundler/nagios.xml                     |  2 +-
 Bundler/news-search.xml                |  6 ---
 Bundler/nfs-server.xml                 |  4 +-
 Bundler/ntp.xml                        |  4 +-
 Bundler/nut.xml                        | 12 +++---
 Bundler/openntpd.xml                   |  4 +-
 Bundler/openvpn.xml                    | 12 +++---
 Bundler/pam.xml                        |  8 ++--
 Bundler/postfix.xml                    | 18 ++++-----
 Bundler/postfix_aliases.xml            |  2 +-
 Bundler/postfix_canonical.xml          |  2 +-
 Bundler/postfix_mime_header_checks.xml |  2 +-
 Bundler/postfix_transport.xml          |  2 +-
 Bundler/postfix_virtual.xml            |  2 +-
 Bundler/proftpd.xml                    |  2 +-
 Bundler/quota.xml                      |  2 +-
 Bundler/rsync-client.xml               |  4 +-
 Bundler/rsyslog.xml                    | 12 +++---
 Bundler/slapd.xml                      | 10 ++---
 Bundler/sqlgrey.xml                    |  6 +--
 Bundler/ssh.xml                        |  6 +--
 Bundler/sudo.xml                       |  2 +-
 Bundler/xen-utils.xml                  | 10 -----
 Metadata/clients.xml                   |  1 -
 Metadata/groups.xml                    |  4 +-
 Python/etc/bcfg2.conf                  |  2 +-
 Python/etc/fstab                       |  8 ++--
 Python/etc/ldap/ldap.conf              |  2 +-
 Python/etc/network/interfaces          |  2 +-
 Python/etc/sudoers                     | 37 +++++++++--------
 Rules/rules.xml                        | 33 +++++++--------
 etc/python/common.py                   |  6 +--
 etc/python/ip.py                       |  8 ++--
 60 files changed, 252 insertions(+), 266 deletions(-)
 delete mode 100644 Bundler/news-search.xml
 delete mode 100644 Bundler/xen-utils.xml

diff --git a/Base/cron.xml b/Base/cron.xml
index d0fc2ba..9b5644b 100644
--- a/Base/cron.xml
+++ b/Base/cron.xml
@@ -1,13 +1,13 @@
 <Base>
   <Group name="vpn">
     <Group name="external">
-      <ConfigFile name="/etc/cron.d/vpn"/>
+      <Path name="/etc/cron.d/vpn"/>
     </Group>
   </Group>
   <Group name="file-server">
-    <ConfigFile name="/etc/cron.d/debris"/>
+    <Path name="/etc/cron.d/debris"/>
   </Group>
   <Group name="users">
-    <ConfigFile name="/etc/cron.d/ethercode"/>
+    <Path name="/etc/cron.d/ethercode"/>
   </Group>
 </Base>
diff --git a/Base/dom0.xml b/Base/dom0.xml
index 6c9b827..d47910b 100644
--- a/Base/dom0.xml
+++ b/Base/dom0.xml
@@ -1,32 +1,32 @@
 <Base>
   <Group name="dom0">
-    <ConfigFile name="/etc/xen/common.py"/>
-    <ConfigFile name="/etc/xen/common_squeeze.py"/>
-    <ConfigFile name="/etc/xen/bcfg2"/>
-    <ConfigFile name="/etc/xen/irc"/>
-    <ConfigFile name="/etc/xen/munin"/>
-    <ConfigFile name="/etc/xen/news"/>
-    <ConfigFile name="/etc/xen/niomniom"/>
-    <ConfigFile name="/etc/xen/o2"/>
-    <ConfigFile name="/etc/xen/titanic"/>
-    <ConfigFile name="/etc/xen/xmpp"/>
-    <ConfigFile name="/etc/xen/ytrap-llatsni"/>
-    <ConfigFile name="/etc/xen/owl"/>
-    <ConfigFile name="/etc/xen/asterisk"/>
-    <ConfigFile name="/etc/xen/radius"/>
-    <ConfigFile name="/etc/xen/ldap"/>
-    <ConfigFile name="/etc/xen/pgsql"/>
-    <ConfigFile name="/etc/xen/redisdead"/>
-    <ConfigFile name="/etc/xen/obm"/>
-    <ConfigFile name="/etc/xen/cerbere"/>
-    <ConfigFile name="/etc/xen/tracker"/>
-    <ConfigFile name="/etc/xen/whatsupdoc"/>
-    <ConfigFile name="/etc/xen/kenobi"/>
-    <ConfigFile name="/etc/xen/sogo"/>
-    <ConfigFile name="/etc/xen/dhcp"/>
-    <ConfigFile name="/etc/xen/log"/>
-    <ConfigFile name="/etc/xen/routeur"/>
-    <ConfigFile name="/etc/xen/puppet"/>
-    <ConfigFile name="/etc/xen/bob"/>
+    <Path name="/etc/xen/common.py"/>
+    <Path name="/etc/xen/common_squeeze.py"/>
+    <Path name="/etc/xen/bcfg2"/>
+    <Path name="/etc/xen/irc"/>
+    <Path name="/etc/xen/munin"/>
+    <Path name="/etc/xen/news"/>
+    <Path name="/etc/xen/niomniom"/>
+    <Path name="/etc/xen/o2"/>
+    <Path name="/etc/xen/titanic"/>
+    <Path name="/etc/xen/xmpp"/>
+    <Path name="/etc/xen/ytrap-llatsni"/>
+    <Path name="/etc/xen/owl"/>
+    <Path name="/etc/xen/asterisk"/>
+    <Path name="/etc/xen/radius"/>
+    <Path name="/etc/xen/ldap"/>
+    <Path name="/etc/xen/pgsql"/>
+    <Path name="/etc/xen/redisdead"/>
+    <Path name="/etc/xen/obm"/>
+    <Path name="/etc/xen/cerbere"/>
+    <Path name="/etc/xen/tracker"/>
+    <Path name="/etc/xen/whatsupdoc"/>
+    <Path name="/etc/xen/kenobi"/>
+    <Path name="/etc/xen/sogo"/>
+    <Path name="/etc/xen/dhcp"/>
+    <Path name="/etc/xen/log"/>
+    <Path name="/etc/xen/routeur"/>
+    <Path name="/etc/xen/puppet"/>
+    <Path name="/etc/xen/bob"/>
   </Group>
 </Base>
diff --git a/Base/needed.xml b/Base/needed.xml
index 685117f..427bd8e 100644
--- a/Base/needed.xml
+++ b/Base/needed.xml
@@ -1,60 +1,60 @@
 <Base>
   <Group name="crans">
-    <ConfigFile name="/etc/hosts"/>
-    <ConfigFile name="/etc/timezone"/>
+    <Python name="/etc/hosts"/>
+    <Path name="/etc/timezone"/>
 
 	 <Package name="python"/>
 	 <Package name="python-netaddr"/>
 	 <Package name="udev"/>
 
-	 <SymLink name="/etc/logcheck/cracking.ignore.d/local-crans"/>
-	 <SymLink name="/etc/logcheck/cracking.ignore.d/local-ignore"/>
-	 <SymLink name="/etc/logcheck/violations.ignore.d/local-crans"/>
-	 <SymLink name="/etc/logcheck/violations.ignore.d/local-ignore"/>
+	 <Path name="/etc/logcheck/cracking.ignore.d/local-crans" type="symlink"/>
+	 <Path name="/etc/logcheck/cracking.ignore.d/local-ignore" type="symlink"/>
+	 <Path name="/etc/logcheck/violations.ignore.d/local-crans" type="symlink"/>
+	 <Path name="/etc/logcheck/violations.ignore.d/local-ignore" type="symlink"/>
  
     <!-- fichier de preferences pour darcs -->
-    <ConfigFile name="/etc/crans/darcs_defaults"/>
+    <Path name="/etc/crans/darcs_defaults"/>
 
     <!-- mail de notification de fichiers non synchronises -->
-    <ConfigFile name="/etc/cron.daily/mailWarn_dirtyDarcsRepo"/>
+    <Path name="/etc/cron.daily/mailWarn_dirtyDarcsRepo"/>
 
     <!-- Gestion des secrets -->
     <Group name="secrets">
       <Group name="bcfg2-server" negate="true">
 	<!-- Sur le serveur les fichiers suivant sont utilises comme
 	     sources pour les clients -->
-	<Directory name="/etc/crans/secrets"/>
-	<ConfigFile name="/etc/crans/secrets/secrets.py"/>
+	<Path name="/etc/crans/secrets" type="directory"/>
+	<Python name="/etc/crans/secrets/secrets.py"/>
         <Group name="rsync">
-          <ConfigFile name="/etc/crans/secrets/rsyncd.secrets"/>
+          <Python name="/etc/crans/secrets/rsyncd.secrets"/>
         </Group>
-        <ConfigFile name="/etc/crans/secrets/slon.py"/>
-        <ConfigFile name="/etc/crans/secrets/nols.py"/>
-        <ConfigFile name="/etc/crans/secrets/README"/>
+        <Python name="/etc/crans/secrets/slon.py"/>
+        <Python name="/etc/crans/secrets/nols.py"/>
+        <Python name="/etc/crans/secrets/README"/>
       </Group>
     </Group>
 
     <Package name="resolvconf"/>
 
-    <Directory name="/usr/scripts"/>
+    <Path name="/usr/scripts" type="directory"/>
   </Group>
 
   <Group name="fstab.local">
     <!-- Autogénération du fstab -->
-    <ConfigFile name="/etc/fstab"/>
+    <Python name="/etc/fstab"/>
   </Group>
 
   <Group name="interfaces.local">
-    <ConfigFile name="/etc/network/interfaces"/>
+    <Python name="/etc/network/interfaces"/>
   </Group>
 
   <Group name="sysctl.local">
-    <ConfigFile name="/etc/sysctl.conf"/>
+    <Python name="/etc/sysctl.conf"/>
   </Group>
 
   <Group name="iscsi">
     <Package name="open-iscsi"/>
-    <ConfigFile name="/etc/udev/rules.d/10_crans_iscsi.rules"/>
+    <Path name="/etc/udev/rules.d/10_crans_iscsi.rules"/>
   </Group>
 
   <Group name="firmware-bnx2">
diff --git a/Bundler/apt-keys.xml b/Bundler/apt-keys.xml
index 550585a..c466b94 100644
--- a/Bundler/apt-keys.xml
+++ b/Bundler/apt-keys.xml
@@ -1,10 +1,11 @@
 <Bundle name="apt" version="2.0">
   <Action name="apt-key-add"/>
   <!-- Cles utilisees pour les paquets fait a la main -->
-  <ConfigFile name="/etc/crans/apt-keys/dimino.asc"/>
-  <ConfigFile name="/etc/crans/apt-keys/blockelet.asc"/>
-  <ConfigFile name="/etc/crans/apt-keys/glondu.asc"/>
-  <ConfigFile name="/etc/crans/apt-keys/dandrimont.asc"/>
-  <ConfigFile name="/etc/crans/apt-keys/durand-gasselin.asc"/>
-  <ConfigFile name="/etc/crans/apt-keys/iffrig.asc"/>
+  <Path name="/etc/crans/apt-keys/dimino.asc"/>
+  <Path name="/etc/crans/apt-keys/blockelet.asc"/>
+  <Path name="/etc/crans/apt-keys/glondu.asc"/>
+  <Path name="/etc/crans/apt-keys/dandrimont.asc"/>
+  <Path name="/etc/crans/apt-keys/durand-gasselin.asc"/>
+  <Path name="/etc/crans/apt-keys/iffrig.asc"/>
+  <Path name="/etc/crans/apt-keys/becue.asc"/>
 </Bundle>
diff --git a/Bundler/apt-listchanges.xml b/Bundler/apt-listchanges.xml
index da1e5c7..00ee5e7 100644
--- a/Bundler/apt-listchanges.xml
+++ b/Bundler/apt-listchanges.xml
@@ -1,5 +1,4 @@
-<Bundle name="apt-listchanges" version="2.0" revision="$Rev$"
-	origin="$URL$">
-  <ConfigFile name="/etc/apt/listchanges.conf"/>
+<Bundle name="apt-listchanges" version="2.0" revision="$Rev$" origin="$URL$">
+  <Path name="/etc/apt/listchanges.conf"/>
   <Package name="apt-listchanges"/>
 </Bundle>
diff --git a/Bundler/apt-mirror.xml b/Bundler/apt-mirror.xml
index 3560bb8..a1782b4 100644
--- a/Bundler/apt-mirror.xml
+++ b/Bundler/apt-mirror.xml
@@ -1,9 +1,9 @@
 <Bundle name="apt-mirror" version="2.0">
   <Package name="apt-mirror"/>
-  <ConfigFile name="/etc/apt/mirror.list"/>
-  <ConfigFile name="/etc/cron.d/apt-mirror"/>
-  <Directory name="/mirror/apt-mirror"/>
-  <Directory name="/mirror/apt-mirror/var"/>
-  <Directory name="/mirror/apt-mirror/skel"/>
-  <Directory name="/mirror/apt-mirror/mirror"/>
+  <Python name="/etc/apt/mirror.list"/>
+  <Path name="/etc/cron.d/apt-mirror"/>
+  <Path name="/mirror/apt-mirror"/>
+  <Path name="/mirror/apt-mirror/var"/>
+  <Path name="/mirror/apt-mirror/skel"/>
+  <Path name="/mirror/apt-mirror/mirror"/>
 </Bundle>
diff --git a/Bundler/apt.xml b/Bundler/apt.xml
index fcac080..a80313f 100644
--- a/Bundler/apt.xml
+++ b/Bundler/apt.xml
@@ -1,6 +1,6 @@
 <Bundle name="apt" version="2.0">
-  <ConfigFile name="/etc/apt/apt.conf.d/01aptitude"/>
-  <ConfigFile name="/etc/apt/apt.conf.d/70debconf"/>
-  <ConfigFile name="/etc/apt/sources.list"/>
+  <Path name="/etc/apt/apt.conf.d/01aptitude"/>
+  <Path name="/etc/apt/apt.conf.d/70debconf"/>
+  <Python name="/etc/apt/sources.list"/>
   <Package name="apt"/>
 </Bundle>
diff --git a/Bundler/arpwatch.xml b/Bundler/arpwatch.xml
index ba99f1f..1b778bb 100644
--- a/Bundler/arpwatch.xml
+++ b/Bundler/arpwatch.xml
@@ -1,6 +1,6 @@
 <Bundle name="arpwatch" version="2.0">
   <Package name="arpwatch"/>
   <Service name="arpwatch"/>
-  <ConfigFile name="/etc/default/arpwatch"/>
-  <ConfigFile name="/etc/arpwatch.conf"/>
+  <Path name="/etc/default/arpwatch"/>
+  <Python name="/etc/arpwatch.conf"/>
 </Bundle>
diff --git a/Bundler/attendre-vert.xml b/Bundler/attendre-vert.xml
index 93de47a..50ea8d4 100644
--- a/Bundler/attendre-vert.xml
+++ b/Bundler/attendre-vert.xml
@@ -1,6 +1,6 @@
 <Bundle name="attendre-vert">
   <Group name="external" negate="true">
-    <ConfigFile name="/etc/init.d/attendre-vert" />
-    <Action name="ln-attendre-vert" />
+    <Path name="/etc/init.d/attendre-vert"/>
+    <Action name="ln-attendre-vert"/>
   </Group>
 </Bundle>
diff --git a/Bundler/autostatus.xml b/Bundler/autostatus.xml
index 614a54a..338bf93 100644
--- a/Bundler/autostatus.xml
+++ b/Bundler/autostatus.xml
@@ -1,5 +1,5 @@
 <Bundle name="autostatus" version="2.0">
-  <ConfigFile name="/etc/cron.d/autostatus"/>
-  <ConfigFile name="/etc/autostatus.conf"/>
+  <Path name="/etc/cron.d/autostatus"/>
+  <Path name="/etc/autostatus.conf"/>
   <Package name="autostatus"/>
 </Bundle>
diff --git a/Bundler/backuppc.xml b/Bundler/backuppc.xml
index dca8b0f..dd714a8 100644
--- a/Bundler/backuppc.xml
+++ b/Bundler/backuppc.xml
@@ -1,5 +1,5 @@
 <Bundle name="backuppc">
-  <ConfigFile name="/etc/backuppc/config.pl"/>
-  <ConfigFile name="/etc/backuppc/hosts"/>
+  <Python name="/etc/backuppc/config.pl"/>
+  <Python name="/etc/backuppc/hosts"/>
   <Package name="backuppc"/>
 </Bundle>
diff --git a/Bundler/bcfg2.xml b/Bundler/bcfg2.xml
index 57392d0..0d14702 100644
--- a/Bundler/bcfg2.xml
+++ b/Bundler/bcfg2.xml
@@ -1,12 +1,13 @@
 <Bundle name="bcfg2" version="2.0">
-  <ConfigFile name="/etc/bcfg2.conf"/>
-  <ConfigFile name="/etc/default/bcfg2"/>
+  <Python name="/etc/bcfg2.conf"/>
+  <Path name="/etc/default/bcfg2"/>
   <Package name="bcfg2"/>
   <Group name="bcfg2-server">
-    <ConfigFile name="/etc/bcfg2-web.conf"/>
+    <Path name="/etc/bcfg2-web.conf"/>
     <Package name="bcfg2-server"/>
     <Service name="bcfg2-server"/>
     <!-- Mise a jour des statistiques bcfg2 et envoi du mail -->
-    <ConfigFile name="/etc/cron.d/bcfg2-crans"/>
+    <Path name="/etc/cron.d/bcfg2-crans"/>
+    <Path name="/etc/cron.daily/bcfg2-update-packages-list"/>
   </Group>
 </Bundle>
diff --git a/Bundler/bind.xml b/Bundler/bind.xml
index ed770c2..1864021 100644
--- a/Bundler/bind.xml
+++ b/Bundler/bind.xml
@@ -1,19 +1,19 @@
 <Bundle name="bind">
-  <ConfigFile name="/etc/bind/rndc.key"/>
-  <ConfigFile name="/etc/bind/named.conf"/>
-  <ConfigFile name="/etc/bind/named.conf.local"/>
-  <ConfigFile name="/etc/bind/named.conf.options"/>
+  <Python name="/etc/bind/rndc.key"/>
+  <Python name="/etc/bind/named.conf"/>
+  <Path name="/etc/bind/named.conf.local"/>
+  <Python name="/etc/bind/named.conf.options"/>
   <Group name="dns-primary">
-      <ConfigFile name="/etc/bind/named.conf.notify"/>
+      <Path name="/etc/bind/named.conf.notify"/>
   </Group>
   <Group name="dns-secondary">
-      <ConfigFile name="/etc/bind/generated/zones_crans"/>
+      <Path name="/etc/bind/generated/zones_crans"/>
   </Group>
   <Group name="dns-secondary-no-forward">
-      <ConfigFile name="/etc/bind/generated/zones_crans"/>
+      <Path name="/etc/bind/generated/zones_crans"/>
   </Group>
   <Group name="vlan-radin">
-      <ConfigFile name="/etc/bind/db.fake"/>
+      <Path name="/etc/bind/db.fake"/>
   </Group>
   <Package name="bind9"/>
   <Service name="bind9"/>
diff --git a/Bundler/corbeau.xml b/Bundler/corbeau.xml
index 8a71bdc..da74605 100644
--- a/Bundler/corbeau.xml
+++ b/Bundler/corbeau.xml
@@ -1,8 +1,8 @@
 <Bundle name="corbeau">
-  <!-- C'est un paquet de dépendances. Il n'installe pas le script du corbeau
+  <!-- C'est un paquet de d&#233;pendances. Il n'installe pas le script du corbeau
        qui se trouve -actuellement- dans /usr/scripts. -->
-  <ConfigFile name="/etc/spamassassin/corbeau.conf"/>
-  <!-- Installé en principe avec inn2 -->
+  <Path name="/etc/spamassassin/corbeau.conf"/>
+  <!-- Install&#233; en principe avec inn2 -->
   <!-- <Package name="inn2-inews"/> -->
   <Package name="procmail"/> <!-- formail -->
   <Package name="spamassassin"/>
diff --git a/Bundler/debconf.xml b/Bundler/debconf.xml
index c806c35..567205b 100644
--- a/Bundler/debconf.xml
+++ b/Bundler/debconf.xml
@@ -1,5 +1,4 @@
-<Bundle name="debconf" version="2.0" revision="$Rev$"
-	origin="$URL$">
-  <ConfigFile name="/etc/apt/apt.conf.d/70debconf"/>
+<Bundle name="debconf" version="2.0" revision="$Rev$" origin="$URL$">
+  <Path name="/etc/apt/apt.conf.d/70debconf"/>
   <Package name="debconf"/>
 </Bundle>
diff --git a/Bundler/ejabberd-extra.xml b/Bundler/ejabberd-extra.xml
index bdf2a5f..3614362 100644
--- a/Bundler/ejabberd-extra.xml
+++ b/Bundler/ejabberd-extra.xml
@@ -1,7 +1,7 @@
 <Bundle name="ejabberd-extra">
-  <ConfigFile name="/etc/pymsnt.conf.xml"/>
-  <ConfigFile name="/etc/pyaimt.conf.xml"/>
-  <ConfigFile name="/etc/pyicqt.conf.xml"/>
+  <Python name="/etc/pymsnt.conf.xml"/>
+  <Python name="/etc/pyaimt.conf.xml"/>
+  <Path name="/etc/pyicqt.conf.xml"/>
   <Package name="pymsnt"/>
   <Package name="pyaimt"/>
   <Package name="pyicqt"/>
diff --git a/Bundler/ejabberd-services.xml b/Bundler/ejabberd-services.xml
index 6efea71..afe64ab 100644
--- a/Bundler/ejabberd-services.xml
+++ b/Bundler/ejabberd-services.xml
@@ -1,7 +1,7 @@
 <Bundle name="ejabberd-services">
-  <ConfigFile name="/etc/default/ejabberd"/>
-  <ConfigFile name="/etc/ejabberd/ejabberd.cfg"/>
-  <ConfigFile name="/etc/ejabberd/ssl/jabber.pem"/>
+  <Python name="/etc/default/ejabberd"/>
+  <Python name="/etc/ejabberd/ejabberd.cfg"/>
+  <Path name="/etc/ejabberd/ssl/jabber.pem"/>
   <Package name="ejabberd"/>
   <Service name="ejabberd"/>
 </Bundle>
diff --git a/Bundler/home.xml b/Bundler/home.xml
index a8f5520..251c9b8 100644
--- a/Bundler/home.xml
+++ b/Bundler/home.xml
@@ -1,9 +1,9 @@
 <Bundle name="home">
   <Group name="home-permanent" negate="true">
     <Group name="external" negate="true">
-      <ConfigFile name="/etc/auto.master"/>
-      <ConfigFile name="/etc/auto.home"/>
-      <ConfigFile name="/etc/default/autofs"/>
+      <Python name="/etc/auto.master"/>
+      <Path name="/etc/auto.home"/>
+      <Path name="/etc/default/autofs"/>
       <Group name="squeeze" negate="true">
           <Package name="autofs"/>
       </Group>
diff --git a/Bundler/jabberd.xml b/Bundler/jabberd.xml
index 6979f45..b4e0d92 100644
--- a/Bundler/jabberd.xml
+++ b/Bundler/jabberd.xml
@@ -1,16 +1,16 @@
 <Bundle name="jabberd">
-  <ConfigFile name="/etc/default/jabber-aim"/>
-  <ConfigFile name="/etc/default/jabber-jud"/>
-  <ConfigFile name="/etc/default/jabber-msn"/>
-  <ConfigFile name="/etc/default/jabber-muc"/>
-  <ConfigFile name="/etc/default/jabber-yahoo"/>
-  <ConfigFile name="/etc/jabber/jabber.xml"/>
-  <ConfigFile name="/etc/jabber/jabber-aim.xml"/>
-  <ConfigFile name="/etc/jabber/jabber-jud.xml"/>
-  <ConfigFile name="/etc/jabber/jabber-msn.xml"/>
-  <ConfigFile name="/etc/jabber/jabber-muc.xml"/>
-  <ConfigFile name="/etc/jabber/jabber-yahoo.xml"/>
-  <ConfigFile name="/etc/jabber/key.pem"/>
+  <Path name="/etc/default/jabber-aim"/>
+  <Path name="/etc/default/jabber-jud"/>
+  <Path name="/etc/default/jabber-msn"/>
+  <Path name="/etc/default/jabber-muc"/>
+  <Path name="/etc/default/jabber-yahoo"/>
+  <Path name="/etc/jabber/jabber.xml"/>
+  <Path name="/etc/jabber/jabber-aim.xml"/>
+  <Path name="/etc/jabber/jabber-jud.xml"/>
+  <Path name="/etc/jabber/jabber-msn.xml"/>
+  <Path name="/etc/jabber/jabber-muc.xml"/>
+  <Path name="/etc/jabber/jabber-yahoo.xml"/>
+  <Python name="/etc/jabber/key.pem"/>
   <Package name="jabber"/>
   <Package name="jabber-aim"/>
   <Package name="jabber-jud"/>
diff --git a/Bundler/ldap.xml b/Bundler/ldap.xml
index 1106772..45b6dde 100644
--- a/Bundler/ldap.xml
+++ b/Bundler/ldap.xml
@@ -1,6 +1,6 @@
 <Bundle name="ldap" version="2.0">
-  <ConfigFile name="/etc/ldap/ldap.conf"/>
-  <ConfigFile name="/etc/ldap.secret"/>
+  <Python name="/etc/ldap/ldap.conf"/>
+  <Python name="/etc/ldap.secret"/>
   <Service name="ssh"/>
   <Group name="db-server">
     <Package name="wfrench"/>
diff --git a/Bundler/locale-generation.xml b/Bundler/locale-generation.xml
index 97add75..3bf5636 100644
--- a/Bundler/locale-generation.xml
+++ b/Bundler/locale-generation.xml
@@ -1,5 +1,4 @@
-<Bundle name="locale-generation" version="2.0" revision="$Rev$"
-	origin="$URL$">
-  <ConfigFile name="/etc/locale.gen"/>
+<Bundle name="locale-generation" version="2.0" revision="$Rev$" origin="$URL$">
+  <Path name="/etc/locale.gen"/>
   <Action name="generate-locales"/>
 </Bundle>
diff --git a/Bundler/locale.xml b/Bundler/locale.xml
index 8187ca7..45995ef 100644
--- a/Bundler/locale.xml
+++ b/Bundler/locale.xml
@@ -1,6 +1,5 @@
-<Bundle name="locale" version="2.0" revision="$Rev$"
-	origin="$URL$">
-  <ConfigFile name="/etc/locale.gen"/>
-  <ConfigFile name="/etc/environment"/>
+<Bundle name="locale" version="2.0" revision="$Rev$" origin="$URL$">
+  <Path name="/etc/locale.gen"/>
+  <Path name="/etc/environment"/>
   <Package name="locales"/>
 </Bundle>
diff --git a/Bundler/logcheck.xml b/Bundler/logcheck.xml
index 3c6872f..3cd8405 100644
--- a/Bundler/logcheck.xml
+++ b/Bundler/logcheck.xml
@@ -1,9 +1,9 @@
 <Bundle name="logcheck">
-  <ConfigFile name="/etc/cron.d/logcheck"/>
-  <ConfigFile name="/etc/logcheck/ignore.d.server/local-crans"/>
-  <ConfigFile name="/etc/logcheck/ignore.d.server/local-ignore"/>
-  <ConfigFile name="/etc/logcheck/logcheck.conf"/>
-  <ConfigFile name="/etc/logcheck/logcheck.logfiles"/>
+  <Path name="/etc/cron.d/logcheck"/>
+  <Path name="/etc/logcheck/ignore.d.server/local-crans"/>
+  <Path name="/etc/logcheck/ignore.d.server/local-ignore"/>
+  <Path name="/etc/logcheck/logcheck.conf"/>
+  <Python name="/etc/logcheck/logcheck.logfiles"/>
   <Package name="logcheck"/>
   <Package name="logcheck-database"/>
   <Package name="syslog-summary"/>
diff --git a/Bundler/molly-guard.xml b/Bundler/molly-guard.xml
index 36d4445..445c20f 100644
--- a/Bundler/molly-guard.xml
+++ b/Bundler/molly-guard.xml
@@ -1,4 +1,4 @@
 <Bundle name="molly-guard">
   <Package name="molly-guard"/>
-  <ConfigFile name="/etc/molly-guard/rc"/>
+  <Path name="/etc/molly-guard/rc"/>
 </Bundle>
diff --git a/Bundler/monit.xml b/Bundler/monit.xml
index 65cb981..2edcc8b 100644
--- a/Bundler/monit.xml
+++ b/Bundler/monit.xml
@@ -1,9 +1,9 @@
 <Bundle name="monit">
-  <ConfigFile name="/etc/default/monit"/>
-  <ConfigFile name="/etc/monit/monitrc"/>
-  <ConfigFile name="/etc/monit/services"/>
-  <ConfigFile name="/etc/monit/conf.d/placeholder"/>
-  <ConfigFile name="/etc/cron.d/monit"/>
+  <Path name="/etc/default/monit"/>
+  <Path name="/etc/monit/monitrc"/>
+  <Python name="/etc/monit/services"/>
+  <Path name="/etc/monit/conf.d/placeholder"/>
+  <Path name="/etc/cron.d/monit"/>
   <Package name="monit"/>
   <Service name="monit"/>
 </Bundle>
diff --git a/Bundler/mumudvb.xml b/Bundler/mumudvb.xml
index fa894bd..b86ae15 100644
--- a/Bundler/mumudvb.xml
+++ b/Bundler/mumudvb.xml
@@ -1,6 +1,6 @@
 <Bundle name="mumudvb">
 <!--  <Package name="mumudvb"/> -->
   <Service name="mumudvb"/>
-  <ConfigFile name="/etc/default/mumudvb"/>
-  <ConfigFile name="/etc/modprobe.d/dvb.conf"/>
+  <Python name="/etc/default/mumudvb"/>
+  <Path name="/etc/modprobe.d/dvb.conf"/>
 </Bundle>
diff --git a/Bundler/munin-node.xml b/Bundler/munin-node.xml
index dba69c5..8d46f2f 100644
--- a/Bundler/munin-node.xml
+++ b/Bundler/munin-node.xml
@@ -4,9 +4,8 @@
   <Package name="munin-plugins-extra"/>
   <Service name="munin-node"/>
   <Action name="link-munin-plugins"/>
-  <ConfigFile name="/etc/munin/munin-node.conf"/>
-  <ConfigFile name="/etc/munin/plugin-conf.d/00-sanitize-env"/>
-  <ConfigFile name="/etc/munin/plugin-conf.d/crans"/>
-  <ConfigFile name="/etc/cron.d/munin-crans"/>
-  <ConfigFile name="/etc/cron.d/munin-node"/>
+  <Python name="/etc/munin/munin-node.conf"/>
+  <Path name="/etc/munin/plugin-conf.d/00-sanitize-env"/>
+  <Path name="/etc/munin/plugin-conf.d/crans"/>
+  <Python name="/etc/cron.d/munin-crans"/>
 </Bundle>
diff --git a/Bundler/nagios.xml b/Bundler/nagios.xml
index a1feb4a..5f4b91c 100644
--- a/Bundler/nagios.xml
+++ b/Bundler/nagios.xml
@@ -2,5 +2,5 @@
   <Service name="nagios-nrpe-server"/>
   <Package name="nagios-nrpe-server"/>
   <Package name="nagios-plugins"/>
-  <ConfigFile name="/etc/nagios/nrpe.cfg"/>
+  <Python name="/etc/nagios/nrpe.cfg"/>
 </Bundle>
diff --git a/Bundler/news-search.xml b/Bundler/news-search.xml
deleted file mode 100644
index 900223c..0000000
--- a/Bundler/news-search.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Bundle name="news-search-php5">
-  <Package name="libapache2-mod-php5"/>
-  <Package name="php5-imap"/>
-  <Service name="news-search"/>
-</Bundle>
-
diff --git a/Bundler/nfs-server.xml b/Bundler/nfs-server.xml
index 6da0fcf..dc47be0 100644
--- a/Bundler/nfs-server.xml
+++ b/Bundler/nfs-server.xml
@@ -1,8 +1,8 @@
 <Bundle name="nfs-server">
   <Group name="crans-nfs-squeeze">
     <Service name="nfs-kernel-server"/>
-    <ConfigFile name="/etc/default/nfs-kernel-server"/>
-    <ConfigFile name="/etc/exports"/>
+    <Path name="/etc/default/nfs-kernel-server"/>
+    <Path name="/etc/exports"/>
     <Package name="nfs-kernel-server"/>
   </Group>
 </Bundle>
diff --git a/Bundler/ntp.xml b/Bundler/ntp.xml
index 9b4f41a..78b689c 100644
--- a/Bundler/ntp.xml
+++ b/Bundler/ntp.xml
@@ -1,6 +1,6 @@
 <Bundle name="ntp">
-  <ConfigFile name="/etc/default/ntp"/>
-  <ConfigFile name="/etc/ntp.conf"/>
+  <Path name="/etc/default/ntp"/>
+  <Python name="/etc/ntp.conf"/>
   <Package name="ntp"/>
   <Service name="ntp"/>
 </Bundle>
diff --git a/Bundler/nut.xml b/Bundler/nut.xml
index 1da5fb2..d8c113d 100644
--- a/Bundler/nut.xml
+++ b/Bundler/nut.xml
@@ -1,12 +1,12 @@
 <Bundle name="nut" version="1.0">
   <Package name="nut"/>
   <Service name="nut"/>
-  <ConfigFile name="/etc/default/nut"/>
-  <ConfigFile name="/etc/nut/upsmon.conf"/>
+  <Path name="/etc/default/nut"/>
+  <Path name="/etc/nut/upsmon.conf"/>
   <Group name="ups-server">
-    <ConfigFile name="/etc/nut/upsd.users"/>
-    <ConfigFile name="/etc/nut/mail.sh"/>
-    <ConfigFile name="/etc/nut/upsd.conf"/>
-    <ConfigFile name="/etc/nut/ups.conf"/>
+    <Path name="/etc/nut/upsd.users"/>
+    <Path name="/etc/nut/mail.sh"/>
+    <Path name="/etc/nut/upsd.conf"/>
+    <Path name="/etc/nut/ups.conf"/>
   </Group>
 </Bundle>
diff --git a/Bundler/openntpd.xml b/Bundler/openntpd.xml
index 075b5da..e8e3fec 100644
--- a/Bundler/openntpd.xml
+++ b/Bundler/openntpd.xml
@@ -1,6 +1,6 @@
 <Bundle name="openntpd">
-  <ConfigFile name="/etc/init.d/openntpd"/>
-  <ConfigFile name="/etc/openntpd/ntpd.conf"/>
+  <Path name="/etc/init.d/openntpd"/>
+  <Python name="/etc/openntpd/ntpd.conf"/>
   <Package name="openntpd"/>
   <Service name="openntpd"/>
 </Bundle>
diff --git a/Bundler/openvpn.xml b/Bundler/openvpn.xml
index f377248..6cd8e21 100644
--- a/Bundler/openvpn.xml
+++ b/Bundler/openvpn.xml
@@ -1,14 +1,14 @@
 <Bundle name="openvpn">
   <Package name="openvpn"/>
   <Service name="openvpn"/>
-  <ConfigFile name="/etc/default/openvpn"/>
+  <Python name="/etc/default/openvpn"/>
   <Group name="external">
-    <ConfigFile name="/etc/openvpn/komaz.conf"/>
-    <ConfigFile name="/etc/openvpn/freebox.conf"/>
+    <Path name="/etc/openvpn/komaz.conf"/>
+    <Path name="/etc/openvpn/freebox.conf"/>
   </Group>
   <Group name="external" negate="true">
-    <ConfigFile name="/etc/openvpn/ovh.conf"/>
-    <ConfigFile name="/etc/openvpn/ovh.connect"/>
-    <ConfigFile name="/etc/openvpn/ovh.disconnect"/>
+    <Path name="/etc/openvpn/ovh.conf"/>
+    <Path name="/etc/openvpn/ovh.connect"/>
+    <Path name="/etc/openvpn/ovh.disconnect"/>
   </Group>
 </Bundle>
diff --git a/Bundler/pam.xml b/Bundler/pam.xml
index 8a3f3e6..7cc5927 100644
--- a/Bundler/pam.xml
+++ b/Bundler/pam.xml
@@ -1,8 +1,8 @@
 <Bundle name="pam" version="2.0">
-  <ConfigFile name="/etc/pam.d/common-account"/>
-  <ConfigFile name="/etc/pam.d/common-auth"/>
-  <ConfigFile name="/etc/pam.d/common-password"/>
-  <ConfigFile name="/etc/pam.d/common-session"/>
+  <Python name="/etc/pam.d/common-account"/>
+  <Python name="/etc/pam.d/common-auth"/>
+  <Python name="/etc/pam.d/common-password"/>
+  <Python name="/etc/pam.d/common-session"/>
   <Group name="ssh">
     <Service name="ssh"/>
   </Group>
diff --git a/Bundler/postfix.xml b/Bundler/postfix.xml
index a5f951c..0dcc4d0 100644
--- a/Bundler/postfix.xml
+++ b/Bundler/postfix.xml
@@ -1,32 +1,32 @@
 <Bundle name="postfix" version="2.0">
   <Package name="postfix"/>
   <Service name="postfix"/>
-  <ConfigFile name="/etc/postfix/main.cf"/>
+  <Python name="/etc/postfix/main.cf"/>
 
   <Group name="tracker">
-    <ConfigFile name="/etc/postfix/master.cf"/>
+    <Python name="/etc/postfix/master.cf"/>
   </Group>
 
   <Group name="mail-mx">
-    <ConfigFile name="/etc/postfix/master.cf"/>
+    <Python name="/etc/postfix/master.cf"/>
 
     <Group name="ldap">
       <Package name="postfix-ldap"/>
-      <ConfigFile name="/etc/postfix/ldap-aliases.cf"/>
-      <ConfigFile name="/etc/postfix/ldap-canonical.cf"/>
+      <Python name="/etc/postfix/ldap-aliases.cf"/>
+      <Python name="/etc/postfix/ldap-canonical.cf"/>
     </Group>
 
     <!-- Greylisting pour les MX publics -->
     <Group name="mail-mx-public">
-      <ConfigFile name="/etc/postfix/ldap-sqlgrey.cf"/>
+      <Python name="/etc/postfix/ldap-sqlgrey.cf"/>
     </Group>
   </Group>
 
   <Group name="mail-mx-main">
     <Package name="sasl2-bin"/>
     <Package name="libsasl2-modules-ldap"/>
-    <ConfigFile name="/etc/postfix/sasl/smtpd.conf"/>
-    <ConfigFile name="/etc/saslauthd.conf"/>
-    <ConfigFile name="/etc/default/saslauthd"/>
+    <Path name="/etc/postfix/sasl/smtpd.conf"/>
+    <Path name="/etc/saslauthd.conf"/>
+    <Path name="/etc/default/saslauthd"/>
   </Group>
 </Bundle>
diff --git a/Bundler/postfix_aliases.xml b/Bundler/postfix_aliases.xml
index 74345c0..4c887a0 100644
--- a/Bundler/postfix_aliases.xml
+++ b/Bundler/postfix_aliases.xml
@@ -1,4 +1,4 @@
 <Bundle name="postfix_aliases" version="2.0">
-  <ConfigFile name="/etc/postfix/aliases"/>
+  <Python name="/etc/postfix/aliases"/>
   <Action name="update-postfix-aliases"/>
 </Bundle>
diff --git a/Bundler/postfix_canonical.xml b/Bundler/postfix_canonical.xml
index dbd1067..0699381 100644
--- a/Bundler/postfix_canonical.xml
+++ b/Bundler/postfix_canonical.xml
@@ -1,6 +1,6 @@
 <Bundle name="postfix_canonical" version="2.0">
   <Group name="mail-mx" negate="true">
-    <ConfigFile name="/etc/postfix/canonical"/>
+    <Python name="/etc/postfix/canonical"/>
     <Action name="update-postfix-canonical"/>
   </Group>
 </Bundle>
diff --git a/Bundler/postfix_mime_header_checks.xml b/Bundler/postfix_mime_header_checks.xml
index e121520..78fffe4 100644
--- a/Bundler/postfix_mime_header_checks.xml
+++ b/Bundler/postfix_mime_header_checks.xml
@@ -1,6 +1,6 @@
 <Bundle name="postfix_mime_header_checks" version="2.0">
   <Group name="mail-mx">
-    <ConfigFile name="/etc/postfix/mime_header_checks"/>
+    <Path name="/etc/postfix/mime_header_checks"/>
     <Action name="update-postfix-mime_header_checks"/>
   </Group>
 </Bundle>
diff --git a/Bundler/postfix_transport.xml b/Bundler/postfix_transport.xml
index 07c0e17..1fac81c 100644
--- a/Bundler/postfix_transport.xml
+++ b/Bundler/postfix_transport.xml
@@ -1,6 +1,6 @@
 <Bundle name="postfix_transport" version="2.0">
   <Group name="postfix.transport">
-    <ConfigFile name="/etc/postfix/transport"/>
+    <Python name="/etc/postfix/transport"/>
     <Action name="update-postfix-transport"/>
   </Group>
 </Bundle>
diff --git a/Bundler/postfix_virtual.xml b/Bundler/postfix_virtual.xml
index 6c9b805..0868a06 100644
--- a/Bundler/postfix_virtual.xml
+++ b/Bundler/postfix_virtual.xml
@@ -1,6 +1,6 @@
 <Bundle name="postfix_virtual" version="2.0">
   <Group name="mail-mx">
-    <ConfigFile name="/etc/postfix/virtual"/>
+    <Path name="/etc/postfix/virtual"/>
     <Action name="update-postfix-virtual"/>
   </Group>
 </Bundle>
diff --git a/Bundler/proftpd.xml b/Bundler/proftpd.xml
index 65f8d2b..10a4a81 100644
--- a/Bundler/proftpd.xml
+++ b/Bundler/proftpd.xml
@@ -1,5 +1,5 @@
 <Bundle name="proftpd">
-  <ConfigFile name="/etc/proftpd/proftpd.conf"/>
+  <Python name="/etc/proftpd/proftpd.conf"/>
   <Package name="proftpd-basic"/>
   <Service name="proftpd"/>
 </Bundle>
diff --git a/Bundler/quota.xml b/Bundler/quota.xml
index b3af111..395f87a 100644
--- a/Bundler/quota.xml
+++ b/Bundler/quota.xml
@@ -1,6 +1,6 @@
 <Bundle name="quota">
   <Service name="quota"/>
   <Service name="quotarpc"/>
-  <ConfigFile name="/etc/default/quota"/>
+  <Path name="/etc/default/quota"/>
   <Package name="quota"/>
 </Bundle>
diff --git a/Bundler/rsync-client.xml b/Bundler/rsync-client.xml
index 887abf5..c43b16a 100644
--- a/Bundler/rsync-client.xml
+++ b/Bundler/rsync-client.xml
@@ -1,6 +1,6 @@
 <Bundle name="rsync-client">
-  <ConfigFile name="/etc/rsyncd.conf"/>
-  <ConfigFile name="/etc/default/rsync"/>
+  <Python name="/etc/rsyncd.conf"/>
+  <Path name="/etc/default/rsync"/>
   <Package name="rsync"/>
   <Service name="rsync"/>
 </Bundle>
diff --git a/Bundler/rsyslog.xml b/Bundler/rsyslog.xml
index 10d46a5..9c15854 100644
--- a/Bundler/rsyslog.xml
+++ b/Bundler/rsyslog.xml
@@ -1,17 +1,17 @@
 <Bundle name="rsyslog" version="2.0">
   <Service name="rsyslog"/>
   <Group name="rsyslog-server">
-    <ConfigFile name="/etc/rsyslog.d/52-listen_relp.conf"/>
-    <ConfigFile name="/etc/rsyslog.d/53-listen_switches.conf"/>
-    <ConfigFile name="/etc/rsyslog.d/51-pgsql.conf"/>
+    <Path name="/etc/rsyslog.d/52-listen_relp.conf"/>
+    <Path name="/etc/rsyslog.d/53-listen_switches.conf"/>
+    <Path name="/etc/rsyslog.d/51-pgsql.conf"/>
     <Package name="rsyslog-pgsql"/>
-    <Directory name="/var/spool/rsyslog"/>
+    <Path name="/var/spool/rsyslog"/>
   </Group>
 
   <Group name="rsyslog-client">
     <Group name="rsyslog-server" negate="true">
-        <ConfigFile name="/etc/rsyslog.d/50-send_relp.conf"/>
-        <Directory name="/var/log/spool"/>
+        <Path name="/etc/rsyslog.d/50-send_relp.conf"/>
+        <Path name="/var/log/spool"/>
     </Group>
   </Group>
 
diff --git a/Bundler/slapd.xml b/Bundler/slapd.xml
index e19712c..c059aa7 100644
--- a/Bundler/slapd.xml
+++ b/Bundler/slapd.xml
@@ -1,9 +1,9 @@
 <Bundle name="slapd" version="2.0">
-  <ConfigFile name="/etc/ldap/slapd.conf"/>
-  <ConfigFile name="/etc/default/slapd"/>
-  <ConfigFile name="/etc/ldap/schema/crans.schema"/>
-  <ConfigFile name="/etc/ldap/schema/amavis.schema"/>
-  <ConfigFile name="/var/lib/ldap/DB_CONFIG"/>
+  <Python name="/etc/ldap/slapd.conf"/>
+  <Python name="/etc/default/slapd"/>
+  <Path name="/etc/ldap/schema/crans.schema"/>
+  <Path name="/etc/ldap/schema/amavis.schema"/>
+  <Path name="/var/lib/ldap/DB_CONFIG"/>
   <Service name="slapd"/>
   <Group name="db-server">
 	  <Package name="slapd"/>
diff --git a/Bundler/sqlgrey.xml b/Bundler/sqlgrey.xml
index 2cef683..1a36124 100644
--- a/Bundler/sqlgrey.xml
+++ b/Bundler/sqlgrey.xml
@@ -1,7 +1,7 @@
 <Bundle name="sqlgrey">
-  <ConfigFile name="/etc/sqlgrey/sqlgrey.conf"/>
-  <ConfigFile name="/etc/sqlgrey/clients_fqdn_whitelist.local"/>
-  <ConfigFile name="/etc/sqlgrey/clients_ip_whitelist.local"/>
+  <Python name="/etc/sqlgrey/sqlgrey.conf"/>
+  <Path name="/etc/sqlgrey/clients_fqdn_whitelist.local"/>
+  <Path name="/etc/sqlgrey/clients_ip_whitelist.local"/>
   <!-- Il n'y a pas de paquet Debian (enfin, pas encore ...)
     <Package name="sqlgrey"/>-->
   <Service name="sqlgrey"/>
diff --git a/Bundler/ssh.xml b/Bundler/ssh.xml
index 0e3ec88..a0e4864 100644
--- a/Bundler/ssh.xml
+++ b/Bundler/ssh.xml
@@ -1,7 +1,7 @@
 <Bundle name="ssh">
   <!-- Fichiers gere par le plugin SSHbase -->
   <!-- Il faut voir comment on le fait cohabiter avec
-       les clés des switchs sur rouge
+       les cl&#233;s des switchs sur rouge
   <ConfigFile name="/etc/ssh/ssh_host_dsa_key"/>
   <ConfigFile name="/etc/ssh/ssh_host_rsa_key"/>
   <ConfigFile name="/etc/ssh/ssh_host_dsa_key.pub"/>
@@ -11,8 +11,8 @@
   <ConfigFile name="/etc/ssh/ssh_known_hosts"/>
   -->
   <!-- -->
-  <ConfigFile name="/etc/ssh/sshd_config"/>
-  <ConfigFile name="/etc/ssh/ssh_config"/>
+  <Python name="/etc/ssh/sshd_config"/>
+  <Path name="/etc/ssh/ssh_config"/>
   <Package name="openssh-client"/>
   <Package name="openssh-server"/>
   <Service name="ssh"/>
diff --git a/Bundler/sudo.xml b/Bundler/sudo.xml
index 2aa3be6..feed657 100644
--- a/Bundler/sudo.xml
+++ b/Bundler/sudo.xml
@@ -1,4 +1,4 @@
 <Bundle name="sudo" version="2.0">
-  <ConfigFile name="/etc/sudoers"/>
+  <Python name="/etc/sudoers"/>
   <Package name="sudo"/>
 </Bundle>
diff --git a/Bundler/xen-utils.xml b/Bundler/xen-utils.xml
deleted file mode 100644
index b252d58..0000000
--- a/Bundler/xen-utils.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Bundle name="xen" version="2.0">
-  <Group name="squeeze" negate="true">
-      <Package name="xen-utils-3.2-1"/>
-  </Group>
-  <Group name="squeeze">
-      <Package name="xen-utils-4.0"/>
-  </Group>
-  <Package name="xen-utils-common"/>
-  <ConfigFile name="/etc/xen/xend-config.sxp"/>
-</Bundle>
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index 457fbe8..54e030b 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -17,7 +17,6 @@
   <Client name="morgan.adm.crans.org" profile="morgan" pingable="N" pingtime="1252769390.14"/>
   <Client name="malloc.adm.crans.org" profile="malloc" pingable="Y" pingtime="1342471851.07"/>
   <Client name="dyson.adm.crans.org" profile="dyson" pingable="Y" pingtime="1342471851.07"/>
-  <Client name="ragnarok.adm.crans.org" profile="ragnarok" pingable="Y" pingtime="1342471851.06"/>
 
   <!-- dom0 -->
   <Client name="fx.adm.crans.org" profile="fx" pingable="Y" pingtime="1342471851.06"/>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 926c670..8f717f2 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -428,6 +428,7 @@
   <!-- | Version de Debian | -->
   <!-- +===================+ -->
 
+  <Group name="debian" category="linux-distribution"/>
   <Group name="lenny" category="debian-version"/>
   <Group name="sid" category="debian-version"/>
   <Group name="etch" category="debian-version"/>
@@ -444,8 +445,7 @@
        a un serveur du Cr@ns. -->
 
   <Group name="crans-common"
-    comment="groupe minimal pour un serveur du Crans"
-    toolset="debian">
+    comment="groupe minimal pour un serveur du Crans">
     <Group name="crans"/>
 
     <!-- TODO: passer les serveurs en utf-8 sans tout casser...
diff --git a/Python/etc/bcfg2.conf b/Python/etc/bcfg2.conf
index f61e96e..16822da 100644
--- a/Python/etc/bcfg2.conf
+++ b/Python/etc/bcfg2.conf
@@ -7,7 +7,7 @@ header("Fichier de configuration de bcfg2")
 if has("bcfg2-server"):
     @[server]
     %repository = "/var/lib/bcfg2"
-    %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,DebAutoPkg,Probes,DBStats"
+    %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,Packages,Probes,DBStats"
     %svn = "no"
 
 @
diff --git a/Python/etc/fstab b/Python/etc/fstab
index aed3b75..a8d7be2 100644
--- a/Python/etc/fstab
+++ b/Python/etc/fstab
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python -*-
 
-header("Les modifications locales sont à placer dans le fichier /etc/fstab.local")
+header("Les modifications locales sont a placer dans le fichier /etc/fstab.local")
 
 def mnt(fs, mntpoint, type, options=[], dump=0, pass_=0):
     print ("%s %s %s %s %d %d" %
@@ -8,16 +8,16 @@ def mnt(fs, mntpoint, type, options=[], dump=0, pass_=0):
             (options and ",".join(options)) or "defaults",
             dump, pass_))
 
-@# Les définitions classiques
+@# Les definitions classiques
 mnt("proc", "/proc", "proc")
 mnt("shm", "/dev/shm", "tmpfs")
 
-@# Les définitions locales
+@# Les definitions locales
 print metadata.Probes["fstab_local"]
 
 if has("nfs"):
     @# Le nfs
     mnt("daath.adm.crans.org:/usr/scripts", "/usr/scripts", "nfs", ["rw"])
     if has("home-permanent"):
-        # Pour ceux qui accèdent beaucoup aux homes on monte tout le /home
+        # Pour ceux qui accedent beaucoup aux homes on monte tout le /home
         mnt("fx.adm.crans.org:/home-adh", "/home", "nfs", ["rw"]);
diff --git a/Python/etc/ldap/ldap.conf b/Python/etc/ldap/ldap.conf
index df0b4cb..5d9cf29 100644
--- a/Python/etc/ldap/ldap.conf
+++ b/Python/etc/ldap/ldap.conf
@@ -9,5 +9,5 @@ header("Acces a la base ldap")
 @# This file should be world readable but not world writable.
 
 @BASE       dc=crans, dc=org
-%URI        "%s" % ldap_socket
+print "URI        %s" % ldap_socket
 @#TLS_CACERT /etc/ssl/certs/CAcrans.pem
diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces
index 3fd1ee4..a7c028c 100644
--- a/Python/etc/network/interfaces
+++ b/Python/etc/network/interfaces
@@ -181,4 +181,4 @@ def adm6(interface):
 Probe_Mac = metadata.Probes["mac"].split('\n')
 If_Mac = dict(zip(Probe_Mac[:-1:2], Probe_Mac[1::2]))
 
-exec metadata.Probes["interfaces_local"]
+exec(str(metadata.Probes["interfaces_local"]))
diff --git a/Python/etc/sudoers b/Python/etc/sudoers
index 886269a..f4b5858 100644
--- a/Python/etc/sudoers
+++ b/Python/etc/sudoers
@@ -7,6 +7,11 @@ header("Configuration du sudo")
 if has("users"):
     @Defaults:ALL tty_tickets
 
+if has("wheezy"):
+    addit = ":ALL"
+else:
+    addit = ""
+
 @Defaults env_keep += "DARCS_EMAIL"
 
 @# Host alias specification
@@ -26,43 +31,43 @@ elif has("2B"):
 @# Cmnd alias specification
 
 @# User privilege specification
-@root       ALL=(ALL) ALL
-@NOUNOUS    ALL=(ALL) ALL
+print "root       ALL=(ALL%s) ALL" % (addit)
+print "NOUNOUS    ALL=(ALL%s) ALL" % (addit)
 
 if has("2B"):
-    @RESPBATS   ALL=(respbats) NOPASSWD: /usr/scripts/gestion/tools/who2b.py
+    print "RESPBATS   ALL=(respbats%s) NOPASSWD: /usr/scripts/gestion/tools/who2b.py" % (addit)
 
 if has("users"):
     @# Les modérateurs ont le whos
-    @MODEROS    ALL=(respbats) /usr/scripts/gestion/whos.py
+    print "MODEROS    ALL=(respbats%s) /usr/scripts/gestion/whos.py" % (addit)
 
     @# Câbleurs
-    @RESPBATS   ALL=(respbats) /usr/scripts/gestion/gest_crans.py,/usr/scripts/gestion/chgpass.py
-    @RESPBATS   ALL=(respbats) /usr/scripts/admin/mail_invalide/mail_invalide.py, /usr/scripts/admin/controle_tresorier.py, /usr/scripts/admin/controle_tresorier2.py, /usr/scripts/admin/controle_tresorier3.py
-    @RESPBATS   ALL=(respbats) NOPASSWD: /usr/scripts/gestion/whos.py,/usr/scripts/utils/chambre.py,/usr/scripts/stats_cableurs.py,/usr/scripts/gestion/tools/whokfet.py
-    @RESPBATS   ALL=(respbats) /usr/scripts/gestion/ressuscite.py
+    print "RESPBATS   ALL=(respbats%s) /usr/scripts/gestion/gest_crans.py,/usr/scripts/gestion/chgpass.py" % (addit)
+    print "RESPBATS   ALL=(respbats%s) /usr/scripts/admin/mail_invalide/mail_invalide.py, /usr/scripts/admin/controle_tresorier.py, /usr/scripts/admin/controle_tresorier2.py, /usr/scripts/admin/controle_tresorier3.py" % (addit)
+    print "RESPBATS   ALL=(respbats%s) NOPASSWD: /usr/scripts/gestion/whos.py,/usr/scripts/utils/chambre.py,/usr/scripts/stats_cableurs.py,/usr/scripts/gestion/tools/whokfet.py" % (addit)
+    print "RESPBATS   ALL=(respbats%s) /usr/scripts/gestion/ressuscite.py" % (addit)
 
     @# Bureau
-    @BUREAU     ALL=(respbats) /usr/scripts/admin/controle_charte_MA.py, /usr/scripts/admin/menage_cableurs.py
+    print "BUREAU     ALL=(respbats%s) /usr/scripts/admin/controle_charte_MA.py, /usr/scripts/admin/menage_cableurs.py" % (addit)
 
     @# intranet
-    @respbats   ALL=(USERS) NOPASSWD: /usr/scripts/gestion/config_mail.py
-    @respbats   ALL=(root) NOPASSWD: /usr/local/bin/quota
+    print "respbats   ALL=(USERS%s) NOPASSWD: /usr/scripts/gestion/config_mail.py" % (addit)
+    print "respbats   ALL=(root%s) NOPASSWD: /usr/local/bin/quota" % (addit)
 
     @# Génération de codes impression pour les imprimeurs
-    @IMPRIMEURS   ALL=(root) /usr/scripts/impression/gen_code.py
+    print "IMPRIMEURS   ALL=(root%s) /usr/scripts/impression/gen_code.py" % (addit)
 
     @# Redémarrage de l'intranet pour les imprimeurs
-    @IMPRIMEURS   ALL=(root) /usr/scripts/impression/redemarre_intranet.sh
+    print "IMPRIMEURS   ALL=(root%s) /usr/scripts/impression/redemarre_intranet.sh" % (addit)
 
     @# Un chsh pour tout le monde
-    @ALL        ALL=(respbats) /usr/scripts/gestion/chsh.py, NOPASSWD:/usr/local/bin/ldap_whoami
+    print "ALL        ALL=(respbats%s) /usr/scripts/gestion/chsh.py, NOPASSWD:/usr/local/bin/ldap_whoami" % (addit)
     @# Quotas
-    @ALL        ALL=NOPASSWD:/usr/local/bin/quota.sh
+    print "ALL        ALL=(respbats%s) NOPASSWD:/usr/local/bin/quota.sh" % (addit)
 
 if has('arpwatch'):
     @# arpwatch
-    @arpwatch   ALL=(arpwatch) NOPASSWD:/usr/scripts/surveillance/arpwatch_sendmail.py
+    print "arpwatch   ALL=(arpwatch%s) NOPASSWD:/usr/scripts/surveillance/arpwatch_sendmail.py" % (addit)
 
 # Inclusion de fichier locaux
 @#includedir /etc/sudoers.d
diff --git a/Rules/rules.xml b/Rules/rules.xml
index 7f74928..29ba8b3 100644
--- a/Rules/rules.xml
+++ b/Rules/rules.xml
@@ -1,4 +1,4 @@
-<Rules priority="0">
+<Rules priority="1">
   <Action name="generate-locales" timing="post" when="modified" status="check"
 	  command="/usr/sbin/update-locale"/>
 
@@ -27,16 +27,16 @@
 	  command="cat /etc/crans/apt-keys/*.asc | apt-key add -"/>
 
   <Group name="users">
-    <Directory name="/etc/crans/secrets" owner="respbats" group="adm" perms="0550"/>
+    <Path name="/etc/crans/secrets" type="directory" owner="respbats" group="adm" perms="0550"/>
   </Group>
 
   <Group name="vo">
-    <Directory name="/etc/crans/secrets" owner="respbats" group="adm" perms="0550"/>
+    <Path name="/etc/crans/secrets" type="directory" owner="respbats" group="adm" perms="0550"/>
   </Group>
 
   <!-- XXX: kludge pour facture.py -->
   <Group name="rouge">
-    <Directory name="/etc/crans/secrets" owner="intranet" group="adm" perms="0550"/>
+    <Path name="/etc/crans/secrets" type="directory" owner="intranet" group="adm" perms="0550"/>
   </Group>
 
   <Group name="mail-mx-main">
@@ -47,18 +47,18 @@
   <Group name="users" negate="true">
     <Group name="rouge" negate="true">
       <Group name="vo" negate="true">
-        <Directory name="/etc/crans/secrets" owner="root" group="adm" perms="0550"/>
+        <Path name="/etc/crans/secrets" type="directory" owner="root" group="adm" perms="0550"/>
       </Group>
     </Group>
   </Group>
 
   <Group name="rsyslog-server">
-    <Directory name="/var/spool/rsyslog" owner="root" group="adm" perms="0750"/>
+    <Path name="/var/spool/rsyslog" type="directory" owner="root" group="adm" perms="0750"/>
   </Group>
 
   <Group name="rsyslog-client">
     <Group name="rsyslog-server" negate="true">
-      <Directory name="/var/log/spool" owner="root" group="adm" perms="750"/>
+      <Path name="/var/log/spool" type="directory" owner="root" group="adm" perms="750"/>
     </Group>
   </Group>
 
@@ -66,12 +66,13 @@
 
   <Service type="deb" name="bind9" status="on"/>
 
-  <Directory name="/mirror/apt-mirror" owner="apt-mirror" group="apt-mirror" perms="0755"/>
-  <Directory name="/mirror/apt-mirror/var" owner="apt-mirror" group="apt-mirror" perms="0755"/>
-  <Directory name="/mirror/apt-mirror/skel" owner="apt-mirror" group="apt-mirror" perms="0755"/>
-  <Directory name="/mirror/apt-mirror/mirror" owner="apt-mirror" group="apt-mirror" perms="0755"/>
+  <Path name="/mirror/apt-mirror" type="directory"  owner="apt-mirror" group="apt-mirror" perms="0755"/>
+  <Path name="/mirror/apt-mirror/var" type="directory" owner="apt-mirror" group="apt-mirror" perms="0755"/>
+  <Path name="/mirror/apt-mirror/skel" type="directory" owner="apt-mirror" group="apt-mirror" perms="0755"/>
+  <Path name="/mirror/apt-mirror/mirror" type="directory" owner="apt-mirror" group="apt-mirror" perms="0755"/>
 
-  <Directory name="/usr/scripts" owner="root" group="adm" perms="775"/>
+
+  <Path name="/usr/scripts" type="directory" owner="root" group="adm" perms="775"/>
 
   <Service type="deb" name="proftpd" status="on"/>
 
@@ -136,10 +137,10 @@
   <Action name="link-munin-plugins" timing="post" when="modified" status="check"
 	  command="python /usr/scripts/munin/scripts/link_plugins.py -f" />
 
-  <SymLink name="/etc/logcheck/cracking.ignore.d/local-crans" to="/etc/logcheck/ignore.d.server/local-crans"/>
-  <SymLink name="/etc/logcheck/cracking.ignore.d/local-ignore" to="/etc/logcheck/ignore.d.server/local-ignore"/>
-  <SymLink name="/etc/logcheck/violations.ignore.d/local-crans" to="/etc/logcheck/ignore.d.server/local-crans"/>
-  <SymLink name="/etc/logcheck/violations.ignore.d/local-ignore" to="/etc/logcheck/ignore.d.server/local-ignore"/>
+  <Path name="/etc/logcheck/cracking.ignore.d/local-crans" type="symlink" to="/etc/logcheck/ignore.d.server/local-crans"/>
+  <Path name="/etc/logcheck/cracking.ignore.d/local-ignore" type="symlink" to="/etc/logcheck/ignore.d.server/local-ignore"/>
+  <Path name="/etc/logcheck/violations.ignore.d/local-crans" type="symlink" to="/etc/logcheck/ignore.d.server/local-crans"/>
+  <Path name="/etc/logcheck/violations.ignore.d/local-ignore" type="symlink" to="/etc/logcheck/ignore.d.server/local-ignore"/>
   
   <Action name="link-firewall" timing="post" when="modified" status="check"
       command="update-rc.d firewall defaults 45"/>
diff --git a/etc/python/common.py b/etc/python/common.py
index 6028dc0..9dc35fe 100644
--- a/etc/python/common.py
+++ b/etc/python/common.py
@@ -25,13 +25,13 @@ import sys
 sys.path.append('/usr/scripts/gestion')
 
 def comment(line):
-    '''Écrit un commentaire'''
+    '''Ecrit un commentaire'''
     out(comment_start + " " + line + "\n")
 
 emacs_mode = "conf-unix"
 
 def header(desc=None, mode=None):
-    '''Écrit une en-tête de fichier avec un commentaire'''
+    '''Ecrit une en-tete de fichier avec un commentaire'''
     comment("-*- mode: %s; coding: utf-8 -*-" % (mode or emacs_mode))
     comment("")
     comment("Fichier gere par BCfg2 (avec le plugin Python)")
@@ -45,7 +45,7 @@ def header(desc=None, mode=None):
     out("\n")
 
 def var(name, value, doc=None):
-    '''Écrit la définition d'une variable'''
+    '''Ecrit la definition d'une variable'''
     if doc: comment(doc)
     out("%s = %s\n" % (name, value))
 
diff --git a/etc/python/ip.py b/etc/python/ip.py
index 5c35d48..93421f1 100644
--- a/etc/python/ip.py
+++ b/etc/python/ip.py
@@ -52,22 +52,22 @@ def radinip():
     if has("vlan-radin"):
         return ip_vlan[hostname]["vlan-radin"]
     else:
-        raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN radin"
+        raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN radin"
 
 def accueilip():
     if has("vlan-accueil"):
         return ip_vlan[hostname]["vlan-accueil"]
     else:
-        raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN d'accueil"
+        raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN d'accueil"
 
 def appt_ens_ip():
     if has("vlan-ens"):
         return ip_vlan[hostname]["vlan-ens"]
     else:
-        raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN des appartements de l'ENS"
+        raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN des appartements de l'ENS"
 
 def isolementip():
     if has("vlan-isolement"):
         return ip_vlan[hostname]["vlan-isolement"]
     else:
-        raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN isolement"
+        raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN isolement"