[D-community-commits] r319 - trunk/fai-config-dir/scripts/LDAPSERVER

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-07-24 18:57:57 +0000 (Thu, 24 Jul 2008)
New Revision: 319

Modified:
   trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd
Log:
don't create the initial ldap layout with fai.


Modified: trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd
===================================================================
--- trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd	2008-07-24 18:52:23 UTC (rev 318)
+++ trunk/fai-config-dir/scripts/LDAPSERVER/10-slapd	2008-07-24 18:57:57 UTC (rev 319)
@@ -3,7 +3,7 @@
 # (C) 2008 Andreas Putzo <andreas at putzo.net>
 # GPL2 licenced
 
-fcopy -r -M /etc/ldap/
+fcopy -r -M /etc/ldap/ && /etc/init.d/slapd restart
 fcopy -r -M /etc/phpldapadmin
 
 #
@@ -12,42 +12,42 @@
 
 #tmp
 # Ugly hack to remove the default database
-#if ! $ROOTCMD ldapsearch -h localhost -x -b "ou=People,dc=debian-community,dc=org" &>/dev/null; then
-    $ROOTCMD /etc/init.d/slapd stop 
-    sleep 2
-    $ROOTCMD rm -rf /var/lib/ldap/*
-    echo -n "Creating initial LDAP directory..."
-    TMPFILE=`mktemp`
-    cat > $TMPFILE <<- EOF 
-dn: dc=org
-dc: net
-objectClass: top
-objectClass: domain
-
-dn: dc=debian-community,dc=org
-dc: visi
-objectClass: top
-objectClass: domain
-
-dn: ou=users,dc=debian-community,dc=org
-ou: users
-objectClass: top
-objectClass: organizationalUnit
-
-dn: uid=admin,ou=users,dc=debian-community,dc=org
-uid: admin
-cn: LDAP administrator
-objectClass: top
-objectClass: groupOfNames
-member: uid=holger,ou=users,dc=debian-community,dc=org
-
-dn: uid=holger,ou=users,dc=debian-community,dc=org
-uid: holger
-EOF
-#   cat $TMPFILE | $ROOTCMD slapadd 
-#   rm $TMPFILE
-#   $ROOTCMD sudo -u openldap slapindex -v
-#   $ROOTCMD  chown openldap:openldap /var/lib/ldap/*
-$ROOTCMD /etc/init.d/slapd restart
+##if ! $ROOTCMD ldapsearch -h localhost -x -b "ou=People,dc=debian-community,dc=org" &>/dev/null; then
+#    $ROOTCMD /etc/init.d/slapd stop 
+#    sleep 2
+#    $ROOTCMD rm -rf /var/lib/ldap/*
+#    echo -n "Creating initial LDAP directory..."
+#    TMPFILE=`mktemp`
+#    cat > $TMPFILE <<- EOF 
+#dn: dc=org
+#dc: net
+#objectClass: top
+#objectClass: domain
+#
+#dn: dc=debian-community,dc=org
+#dc: visi
+#objectClass: top
+#objectClass: domain
+#
+#dn: ou=users,dc=debian-community,dc=org
+#ou: users
+#objectClass: top
+#objectClass: organizationalUnit
+#
+#dn: uid=admin,ou=users,dc=debian-community,dc=org
+#uid: admin
+#cn: LDAP administrator
+#objectClass: top
+#objectClass: groupOfNames
+#member: uid=holger,ou=users,dc=debian-community,dc=org
+#
+#dn: uid=holger,ou=users,dc=debian-community,dc=org
+#uid: holger
+#EOF
+##   cat $TMPFILE | $ROOTCMD slapadd 
+##   rm $TMPFILE
+##   $ROOTCMD sudo -u openldap slapindex -v
+##   $ROOTCMD  chown openldap:openldap /var/lib/ldap/*
+#$ROOTCMD /etc/init.d/slapd restart
 #fi