From f0ef97bcaa21e1843eca4c5828e20ad9f66e5610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?=
 <Pierre-Elliott.Becue@crans.org>
Date: Thu, 6 Dec 2012 04:26:05 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: 444973fde1b658a75a7659f316b1292c

darcs-hash:20121206032605-b6762-3bd8e5b03f8717fe18d239c7099907964c119061.gz
---
 Bundler/nss.xml           | 18 ------------
 Bundler/pam.xml           |  4 ---
 Bundler/portmap.xml       |  4 ---
 Metadata/groups.xml       |  3 +-
 Python/etc/nss-ldapd.conf | 62 ---------------------------------------
 Rules/rules.xml           |  9 +++++-
 6 files changed, 9 insertions(+), 91 deletions(-)
 delete mode 100644 Bundler/nss.xml
 delete mode 100644 Bundler/portmap.xml
 delete mode 100644 Python/etc/nss-ldapd.conf

diff --git a/Bundler/nss.xml b/Bundler/nss.xml
deleted file mode 100644
index b0daf54..0000000
--- a/Bundler/nss.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Bundle name="nss">
-  <ConfigFile name="/etc/nsswitch.conf"/>
-  <Group name="ssh">
-    <Service name="ssh"/>
-  </Group>
-  <Group name="ldap">
-    <Group name="nss-ldapd" negate="true">
-      <Package name="libnss-ldap"/>
-      <ConfigFile name="/etc/libnss-ldap.conf"/>
-      <ConfigFile name="/etc/libnss-ldap.secret"/>
-    </Group>
-    <Group name="nss-ldapd">
-      <Package name="libnss-ldapd"/>
-      <ConfigFile name="/etc/nss-ldapd.conf"/>
-      <Service name="nslcd"/>
-    </Group>
-  </Group>
-</Bundle>
diff --git a/Bundler/pam.xml b/Bundler/pam.xml
index c20b638..8a3f3e6 100644
--- a/Bundler/pam.xml
+++ b/Bundler/pam.xml
@@ -6,10 +6,6 @@
   <Group name="ssh">
     <Service name="ssh"/>
   </Group>
-  <Group name="ldap">
-    <Package name="libpam-ldap"/>
-    <ConfigFile name="/etc/pam_ldap.conf"/>
-  </Group>
   <Group name="db-server">
     <Package name="libpam-cracklib"/>
   </Group>
diff --git a/Bundler/portmap.xml b/Bundler/portmap.xml
deleted file mode 100644
index 826732f..0000000
--- a/Bundler/portmap.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Bundle name="portmap">
-  <Package name="portmap"/>
-  <Service name="portmap"/>
-</Bundle>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 524704d..7402d77 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -502,7 +502,6 @@
      comment="profile minimal pour wheezy">
     <Group name="crans-common"/>
     <Group name="wheezy"/>
-    <Group name="nss-ldapd"/>
     <Group name="ntp"/>
   </Group>
 
@@ -1140,7 +1139,7 @@
   </Group>
 
   <Group name="nfs">
-    <Bundle name="portmap"/>
+    <Bundle name="rpc"/>
   </Group>
 
   <Group name="apache"
diff --git a/Python/etc/nss-ldapd.conf b/Python/etc/nss-ldapd.conf
deleted file mode 100644
index 1b83480..0000000
--- a/Python/etc/nss-ldapd.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- mode: python; coding: utf-8 -*-
-
-include("mode/space")
-include("secrets")
-include("ldap")
-
-header("""
-Fichier de configuration pour libnss-ldapd.
-
-Pour des informations détaillées voir nss-ldapd.conf(5)
-""")
-
-info["perms"] = 0600
-
-@# +---------------------------------------------------+
-@# |            Configuration du démon nslcd           |
-@# +---------------------------------------------------+
-@
-@# Utilisateur sous lequel faire tourner le démon
-@uid nslcd
-@gid nslcd
-@
-
-@# +---------------------------------------------------+
-@# | Configuration de la communication avec le serveur |
-@# +---------------------------------------------------+
-@
-%uri "%s" % ldap_socket
-@
-@# Le distinguished name de la base de recherche
-%base "dc=crans,dc=org"
-@
-@# Le DN avec lequel se connecter à la base.
-%binddn secrets.ldap_readonly_auth_dn
-@
-@# Et le mot de passe associé
-%bindpw secrets.ldap_readonly_password
-@
-@# La version de LDAP à utiliser
-%ldap_version 3
-@
-@# Temps d'attente d'une réponse du serveur LDAP
-%timelimit 5
-@
-@# Temps d'attente à la connexion au serveur LDAP
-%bind_timelimit 5
-@
-@# +------------------+
-@# | Bases de données |
-@# +------------------+
-@
-# On utilise ldap pour résoudre les bases de données
-# passwd, group et shadow
-@# Bases de recherche
-@base passwd ou=data,dc=crans,dc=org
-@base shadow ou=data,dc=crans,dc=org
-@base group ou=Group,dc=crans,dc=org
-
-if ldap_filter:
-    @
-    @# Filtre de recherche
-    print "filter passwd (%s)" % ldap_filter
diff --git a/Rules/rules.xml b/Rules/rules.xml
index 48413d5..7f74928 100644
--- a/Rules/rules.xml
+++ b/Rules/rules.xml
@@ -110,8 +110,15 @@
   <Service type="deb" name="jabber" status="on"/>
 
   <Service type="deb" name="ejabberd" status="on"/>
+  
+  <Group name="squeeze">
+      <Service type="deb" name="portmap" status="on"/>
+  </Group>
+
+  <Group name="wheezy">
+      <Service type="deb" name="rpcbind" status="on"/>
+  </Group>
 
-  <Service type="deb" name="portmap" status="on"/>
   <Action name="ln-attendre-vert" timing="post" when="modified" status="check"
       command="ln -s /etc/init.d/attendre-vert /etc/rcS.d/S41attendre-vert" />