From 424da2513779d64e753a58fd43132a5166c2e945 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 26 Oct 2008 23:11:42 +0100 Subject: Separate slapd.conf.d snippets from ldif snippets. --- ldap/mkldapdb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ldap/mkldapdb') diff --git a/ldap/mkldapdb b/ldap/mkldapdb index 31ad606..5e6052f 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -46,10 +46,10 @@ nextfreeid() { echo "$id" } -masterdir=/etc/local-COMMON/ldap/db +masterdir=/etc/local-COMMON/ldap tempdir=`mktemp -dt slapd.XXXXXX` -snippets="$(LANG=C find "$masterdir" -type f -name '*.conf.in' | sort)" +snippets="$(run-parts --list --regex '^[0-9]+_[a-z0-9-]+\.conf\.in$' "$masterdir/slapd.conf.d")" spacecat $snippets | sed >>"$tempdir/slapd.conf" \ -e "s/@BACKEND@/$backend/g" \ -e "s/@SUFFIX@/$basedn/g" \ @@ -58,7 +58,7 @@ spacecat $snippets | sed >>"$tempdir/slapd.conf" \ # TODO: Better separate core from normal lif files than "below 100"... file=99 for section in core base cipux horde; do - sed <"$masterdir/$section.ldif.in" >"$tempdir/${file}_$section.ldif" \ + sed <"$masterdir/db/$section.ldif.in" >"$tempdir/${file}_$section.ldif" \ -e "s/@SUFFIX@/$basedn/g" \ -e "s/@DOMAIN@/$dnsdomain/g" \ -e "s/@ORG@/$orgname/g" @@ -74,7 +74,7 @@ file=200 for role in admin professor assistant pupil student tutor teacher lecturer; do uid="$(nextfreeid uid "$uid")" gid="$(nextfreeid gid "$gid")" - snippets="$masterdir/cipux_rolegroup.ldif.in $masterdir/cipux_roleuser.ldif.in" + snippets="$masterdir/db/cipux_rolegroup.ldif.in $masterdir/db/cipux_roleuser.ldif.in" spacecat $snippets | sed >"$tempdir/${file}_$role.ldif" \ -e "s/@SUFFIX@/$basedn/g" \ -e "s/@ROLE@/$role/g" \ -- cgit v1.2.3