diff options
| author | root <root@borneuni.dk> | 2008-09-15 21:47:24 +0000 |
|---|---|---|
| committer | root <root@borneuni.dk> | 2008-09-15 21:47:24 +0000 |
| commit | ade0f747830123ec59808633e594abc4f59ab260 (patch) | |
| tree | 6c4a689119604e45553e643b36c4b9d7058f6e93 | |
| parent | 796c18f6c557b9d0e0ad692e46965b66bc99cc65 (diff) | |
| parent | 3e74522b00011ab7070e5c3b30c60572e2d05fc3 (diff) | |
Merge branch 'master' of git://source.jones.dk/local-COMMON
| -rw-r--r-- | ldap/db/base.ldif.in | 5 | ||||
| -rw-r--r-- | ldap/db/horde.ldif.in | 6 | ||||
| -rwxr-xr-x | ldap/mkldapdb | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ldap/db/base.ldif.in b/ldap/db/base.ldif.in index 8b9d263..2d1a0d6 100644 --- a/ldap/db/base.ldif.in +++ b/ldap/db/base.ldif.in @@ -5,6 +5,11 @@ objectClass: organization o: @DOMAIN@ dc: @ORG@ +dn: ou=DSA, @SUFFIX@ +objectclass: organizationalUnit +ou: DSA +description: Directory System Agent + dn: ou=people, @SUFFIX@ objectClass: organizationalUnit ou: people diff --git a/ldap/db/horde.ldif.in b/ldap/db/horde.ldif.in new file mode 100644 index 0000000..0e1bab0 --- /dev/null +++ b/ldap/db/horde.ldif.in @@ -0,0 +1,6 @@ +dn: cn=horde, ou=DSA, @SUFFIX@ +objectclass: organizationalRole +objectClass: top +objectClass: simpleSecurityObject +userPassword: superSecretPassword +cn: horde diff --git a/ldap/mkldapdb b/ldap/mkldapdb index 374e4cd..ce9a8c6 100755 --- a/ldap/mkldapdb +++ b/ldap/mkldapdb @@ -13,13 +13,13 @@ checkpoint="checkpoint 512 30" backend="bdb" backendoptions="# For the Debian package we use 2MB as default but be sure to update this\n# value if you have plenty of RAM\ndbconfig set_cachesize 0 2097152 0\n\n# Sven Hartge reported that he had to set this value incredibly high\n# to get slapd running at all. See http:\/\/bugs.debian.org\/303057\n# for more information.\n\n# Number of objects that can be locked at the same time.\ndbconfig set_lk_max_objects 1500\n# Number of locks (both requested and granted)\ndbconfig set_lk_max_locks 1500\n# Number of lockers\ndbconfig set_lk_max_lockers 1500" -if [ -r /etc/local/org.conf ]; then - . /etc/local/org.conf +if [ -r /etc/local-ORG/orgname ]; then + orgname="$(head -n 1 /etc/local-ORG/orgname)" fi for var in basedn dnsdomain orgname backend; do if [ -z "`eval echo '$'$var`" ]; then - echo 2> "ERROR: Required variable '$var' missing. Exiting...!" + echo 1>&2 "ERROR: Required variable '$var' missing. Exiting...!" exit 1 fi done @@ -29,7 +29,7 @@ tempdir=`mktemp -dt slapd.XXXXXX` cfgdir=/etc/ldap dbdir=/var/lib/ldap -for section in base; do +for section in base horde; do sed <"$masterdir/$section.ldif.in" >"$tempdir/$section.ldif" \ -e "s/@SUFFIX@/$basedn/g" \ -e "s/@DOMAIN@/$dnsdomain/g" \ |