From 30ec0775f29eaf4da5861ec2047cb4afdf93f211 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Wed, 29 Jul 2009 10:17:06 +0200
Subject: [PATCH] addsite: Update to new LDAP schema.

---
 usr/local/bin/addsite | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/local/bin/addsite b/usr/local/bin/addsite
index 9ef8ae4..cc64350 100755
--- a/usr/local/bin/addsite
+++ b/usr/local/bin/addsite
@@ -19,8 +19,8 @@ HTTPD_USERS_GID=1002
 # The template to copy
 TEMPLATE_DIR=/data/www/template
 # The bases to create users under
-USERBASE="ou=Httpd Users,ou=Users,dc=drsnuggles,dc=stderr,dc=nl"
-GROUPBASE="ou=Domain Groups,ou=Groups,dc=drsnuggles,dc=stderr,dc=nl"
+USERBASE="uniqueIdentifier=7,uniqueIdentifier=6,dc=drsnuggles,dc=stderr,dc=nl"
+GROUPBASE="uniqueIdentifier=4,uniqueIdentifier=8,dc=drsnuggles,dc=stderr,dc=nl"
 # PHP config to change the error_log setting in
 PHP_CONFIG=conf/php.ini.override
 # PHP error logfile to set error_log to
@@ -68,17 +68,20 @@ else
 	ldapvi --profile bind --add --in --ldapvi <<EOF || exit
 add cn=$GROUP,$GROUPBASE
 cn: $GROUP
+displayName: $SITE
 gidNumber: $ID
-objectClass: posixGroup
+objectClass: simplePosixGroup
+objectClass: simpleGroup
 objectClass: top
 
-add cn=$SITE,$USERBASE
-cn: $SITE
+add cn=$SCRIPT_USER,$USERBASE
+cn: $SCRIPT_USER
+displayName: $SITE
 uidNumber: $ID
 gidNumber: $HTTPD_USERS_GID
 homeDirectory: $DIR
 objectClass: posixAccount
-objectClass: account
+objectClass: simpleObject
 objectClass: top
 uid: $SCRIPT_USER
 EOF
-- 
2.30.2