From c35474b16ebd74df554218e75a0c8dea861d65b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Fri, 5 Apr 2013 08:18:22 +0200
Subject: [PATCH] [domus/var] Mise en place d'une conf wheezy pour les domus,
 et un peu de #random.

---
 Base/dom0.xml              |  1 +
 Cfg/etc/xen/kenobi/kenobi  |  2 +-
 Metadata/groups.xml        | 12 ++++++++++--
 Python/etc/postfix/main.cf |  6 +-----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Base/dom0.xml b/Base/dom0.xml
index a75eb2b..fec8485 100644
--- a/Base/dom0.xml
+++ b/Base/dom0.xml
@@ -2,6 +2,7 @@
   <Group name="dom0">
     <Path name="/etc/xen/common.py"/>
     <Path name="/etc/xen/common_squeeze.py"/>
+    <Path name="/etc/xen/common_wheezy.py"/>
     <Path name="/etc/xen/bcfg2"/>
     <Path name="/etc/xen/irc"/>
     <Path name="/etc/xen/munin"/>
diff --git a/Cfg/etc/xen/kenobi/kenobi b/Cfg/etc/xen/kenobi/kenobi
index 3407924..31bc9fc 100644
--- a/Cfg/etc/xen/kenobi/kenobi
+++ b/Cfg/etc/xen/kenobi/kenobi
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python -*-
 
-execfile("/etc/xen/common_squeeze.py")
+execfile("/etc/xen/common_wheezy.py")
 
 name = "kenobi"
 
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 06fb019..6a8d7a1 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -222,6 +222,7 @@
   <Group name="xmpp"
          profile="true">
     <Group name="ejabberd-services"/>
+    <Group name="ejabberd-server"/>
     <Group name="crans-domu-squeeze"/>
   </Group>
 
@@ -363,7 +364,7 @@
 
   <Group name="kenobi"
         profile="true">
-    <Group name="crans-domu-squeeze"/>
+    <Group name="crans-domu-wheezy"/>
   </Group>
 
   <Group name="sogo"
@@ -490,7 +491,14 @@
      comment="profile minimal pour squeeze">
     <Group name="crans-common"/>
     <Group name="squeeze"/>
-    <Group name="nss-ldapd"/>
+    <Group name="domu"/>
+    <Group name="ntpdate"/>
+  </Group>
+
+  <Group name="crans-domu-wheezy" public="true"
+     comment="profile minimal pour wheezy">
+    <Group name="crans-common"/>
+    <Group name="wheezy"/>
     <Group name="domu"/>
     <Group name="ntpdate"/>
   </Group>
diff --git a/Python/etc/postfix/main.cf b/Python/etc/postfix/main.cf
index 7461d43..14d0285 100644
--- a/Python/etc/postfix/main.cf
+++ b/Python/etc/postfix/main.cf
@@ -223,11 +223,7 @@ if main:
 if main:
     @# Filtrage sur les sources de connexions
     print "smtpd_client_restrictions = permit_mynetworks,"
-    print "    reject_rbl_client dnsbl.ahbl.org,"
-    print "    reject_rbl_client zen.spamhaus.org,"
-    print "    reject_rbl_client dnsbl.sorbs.net,"
-    print "    reject_rbl_client list.dsbl.org,"
-    print "    reject_rbl_client multihop.dsbl.org"
+    print "    reject_rbl_client dnsbl.ahbl.org"
     @
     @#
     @# Requiring this will stop some UCE software.