From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 27 Jun 2009 14:17:19 +0000 (+0200)
Subject: ldap.conf has been added to puppet
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=48c4da775783b3a16293b3b0a77bd5a8e43333c6

ldap.conf has been added to puppet
---

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 16bd2bf..edaad0a 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -180,18 +180,6 @@ EOF
   test that the dedicated sudo password works.  if not, undo the pam sudo config.
   (comment out the auth lines and include common-auth again)
 
-* setup ldap.conf:
-{{{
-    grep '^URI.*db.debian.org' /etc/ldap/ldap.conf || cat >> /etc/ldap/ldap.conf << EOF
-
-URI             ldap://db.debian.org
-BASE            dc=debian,dc=org
-
-TLS_CACERT      /etc/ssl/certs/spi-cacert-2008.pem
-TLS_REQCERT     hard
-EOF
-}}}
-
 * add to munin on spohr
 {{{
     : :: spohr :: && sudo vi /etc/munin/munin.conf