diff options
| -rwxr-xr-x | ldap/mkldapdb | 8 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/05_slapd.conf.in (renamed from ldap/db/05_slapd.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/08_base.conf.in (renamed from ldap/db/08_base.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/10_base.conf.in (renamed from ldap/db/10_base.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/30_cipux.conf.in (renamed from ldap/db/30_cipux.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/40_horde.conf.in (renamed from ldap/db/40_horde.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/50_samba.conf.in (renamed from ldap/db/50_samba.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/80_base.conf.in (renamed from ldap/db/80_base.conf.in) | 0 | ||||
| -rw-r--r-- | ldap/slapd.conf.d/95_slapd.conf.in (renamed from ldap/db/95_slapd.conf.in) | 0 |
9 files changed, 4 insertions, 4 deletions
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" \ diff --git a/ldap/db/05_slapd.conf.in b/ldap/slapd.conf.d/05_slapd.conf.in index dde73b3..dde73b3 100644 --- a/ldap/db/05_slapd.conf.in +++ b/ldap/slapd.conf.d/05_slapd.conf.in diff --git a/ldap/db/08_base.conf.in b/ldap/slapd.conf.d/08_base.conf.in index 1d78c6a..1d78c6a 100644 --- a/ldap/db/08_base.conf.in +++ b/ldap/slapd.conf.d/08_base.conf.in diff --git a/ldap/db/10_base.conf.in b/ldap/slapd.conf.d/10_base.conf.in index 0781b3d..0781b3d 100644 --- a/ldap/db/10_base.conf.in +++ b/ldap/slapd.conf.d/10_base.conf.in diff --git a/ldap/db/30_cipux.conf.in b/ldap/slapd.conf.d/30_cipux.conf.in index f20751f..f20751f 100644 --- a/ldap/db/30_cipux.conf.in +++ b/ldap/slapd.conf.d/30_cipux.conf.in diff --git a/ldap/db/40_horde.conf.in b/ldap/slapd.conf.d/40_horde.conf.in index bbae52a..bbae52a 100644 --- a/ldap/db/40_horde.conf.in +++ b/ldap/slapd.conf.d/40_horde.conf.in diff --git a/ldap/db/50_samba.conf.in b/ldap/slapd.conf.d/50_samba.conf.in index 4eee5cd..4eee5cd 100644 --- a/ldap/db/50_samba.conf.in +++ b/ldap/slapd.conf.d/50_samba.conf.in diff --git a/ldap/db/80_base.conf.in b/ldap/slapd.conf.d/80_base.conf.in index 2e7b571..2e7b571 100644 --- a/ldap/db/80_base.conf.in +++ b/ldap/slapd.conf.d/80_base.conf.in diff --git a/ldap/db/95_slapd.conf.in b/ldap/slapd.conf.d/95_slapd.conf.in index 861511c..861511c 100644 --- a/ldap/db/95_slapd.conf.in +++ b/ldap/slapd.conf.d/95_slapd.conf.in |