diff options
| author | root <root@borneuni.dk> | 2008-09-15 22:03:27 +0000 |
|---|---|---|
| committer | root <root@borneuni.dk> | 2008-09-15 22:03:27 +0000 |
| commit | 522de2340e4f29d26bf08588056d4cd6705f7b1a (patch) | |
| tree | 2398caf2519f27303a7b7a55cf4bbbd578f12a76 | |
| parent | ade0f747830123ec59808633e594abc4f59ab260 (diff) | |
| parent | c21b3a4817945a608cc4ab5a28dff97b91c5346c (diff) | |
Merge branch 'master' of git://source.jones.dk/local-COMMON
| -rw-r--r-- | ldap/db/base.ldif.in | 7 | ||||
| -rw-r--r-- | ldap/db/core.ldif.in | 6 | ||||
| -rwxr-xr-x | ldap/mkldapdb | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/ldap/db/base.ldif.in b/ldap/db/base.ldif.in index 2d1a0d6..31624a6 100644 --- a/ldap/db/base.ldif.in +++ b/ldap/db/base.ldif.in @@ -1,10 +1,3 @@ -dn: @SUFFIX@ -objectClass: top -objectClass: dcObject -objectClass: organization -o: @DOMAIN@ -dc: @ORG@ - dn: ou=DSA, @SUFFIX@ objectclass: organizationalUnit ou: DSA diff --git a/ldap/db/core.ldif.in b/ldap/db/core.ldif.in new file mode 100644 index 0000000..a9aa24f --- /dev/null +++ b/ldap/db/core.ldif.in @@ -0,0 +1,6 @@ +dn: @SUFFIX@ +objectClass: top +objectClass: dcObject +objectClass: organization +o: @DOMAIN@ +dc: @ORG@ diff --git a/ldap/mkldapdb b/ldap/mkldapdb index ce9a8c6..38b5617 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -29,7 +29,7 @@ tempdir=`mktemp -dt slapd.XXXXXX` cfgdir=/etc/ldap dbdir=/var/lib/ldap -for section in base horde; do +for section in core base horde; do sed <"$masterdir/$section.ldif.in" >"$tempdir/$section.ldif" \ -e "s/@SUFFIX@/$basedn/g" \ -e "s/@DOMAIN@/$dnsdomain/g" \ |