diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index f9bdb15..e384b4a 100755
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -1,63 +1,60 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
+
+
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 855f301..eee94e9 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -476,6 +476,14 @@
+
+
+
+
+
+
+
diff --git a/Python/etc/bcfg2.conf b/Python/etc/bcfg2.conf
index 16822da..a4a1ab6 100644
--- a/Python/etc/bcfg2.conf
+++ b/Python/etc/bcfg2.conf
@@ -6,29 +6,33 @@ header("Fichier de configuration de bcfg2")
if has("bcfg2-server"):
@[server]
- %repository = "/var/lib/bcfg2"
- %plugins = "Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,Packages,Probes,DBStats"
- %svn = "no"
+ @repository=/var/lib/bcfg2
+ @plugins=Metadata,Bundler,Base,SSHbase,Cfg,Rules,Python,Packages,Probes,DBStats
+ @svn=no
+ @listen_all=True
@
@[statistics]
-%sendmailpath = "/usr/sbin/sendmail"
+@sendmailpath=/usr/sbin/sendmail
if has("bcfg2-server"):
- %database_engine = "sqlite3"
+ @database_engine=sqlite3
@
@[communication]
-%protocol = "xmlrpc/ssl"
+@protocol=xmlrpc/ssl
%password = secrets.bcfg2_password
if has("bcfg2-server"):
- %key = "/etc/ssl/private/bcfg2_privatekey.pem"
- %certificate = "/etc/ssl/certs/bcfg2_server.pem"
-%ca = "/etc/ssl/certs/cacert.org.pem"
+ @key=/etc/ssl/private/bcfg2_privatekey.pem
+ @certificate=/etc/ssl/certs/bcfg2_server.pem
+@ca=/etc/ssl/certs/cacert.org.pem
-%agent-port = 6790
-%encoding = "UTF-8"
+@agent-port=6790
+@encoding=UTF-8
@
@[components]
-%bcfg2 = "https://bcfg2.adm.crans.org:6789"
-%encoding = "UTF-8"
+if has("bcfg2-server"):
+ @bcfg2=https://cfengine.v6.adm.crans.org:6789
+else:
+ @bcfg2=https://cfengine.v4.adm.crans.org:6789
+@encoding=UTF-8