From ed745991943c51a478a047532b6b349ea47cb834 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 16 Jun 2011 16:59:06 +0000
Subject: [PATCH] integrate-distro.sh: DHCP-server, Samba, LDAP

  - Add packages dhcp-server, samba-client bprof-run
  - Copy /etc/openldap/schema/authldap.schema, the
    schema coming with courier-authlib-ldap doesn't cut it,
    lacks mailhost attribute
  - Copy /var/lib/ldap to seed the database
---
 scripts/integrate-distro.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 1696d786..5a7ccf22 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -40,10 +40,11 @@ payload_pkgs="
 	proftpd
 	proftpd-ldap
 	xntp
+	bind
+	dhcp-server
 	rsyslog
 	openldap2
 	courier-authlib-ldap
-	bind
 	xinetd
 	apache2
 
@@ -56,6 +57,7 @@ payload_pkgs="
 
 	dhcpcd
 	nfs-client
+	samba-client
 	sudo
 	sysconfig
 	glibc-locale
@@ -100,6 +102,7 @@ payload_pkgs="
 	jux-client-run
 	feedfsd-run
 	snmp-manager-run
+	bprof-run
 "
 # -- functions
 usage()
@@ -609,6 +612,7 @@ cmd_install()
 	setup_root_directory
 	setup_bind_mounts
 
+	mv $root/var/lib/ldap $root/var/lib/ldap-$myname
 	mkdir -p -m 755 $root/etc
 	mkdir -p -m 755 $root/etc/openldap
 	for c in \
@@ -619,6 +623,8 @@ cmd_install()
 		/etc/openldap/slapd.conf \
 		/etc/sysconfig/keyboard \
 		/etc/sysconfig/clock \
+		/etc/openldap/schema/authldap.schema \
+		/var/lib/ldap \
 	; do
 		install -d -m 755 `dirname $root$c`
 		cp -rp $c $root$c