diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-10-10 23:25:22 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:42:54 +0100 |
| commit | 5c4a4b45667a714cb1154f20eccb56d00c1163a7 (patch) | |
| tree | 93aec832c367911563100c64ce57ed7cf512e7a0 /source4/setup | |
| parent | 286157f4aa0cdc704fed1c9aa11895a44c9cab18 (diff) | |
| download | samba-5c4a4b45667a714cb1154f20eccb56d00c1163a7.tar.gz samba-5c4a4b45667a714cb1154f20eccb56d00c1163a7.tar.bz2 samba-5c4a4b45667a714cb1154f20eccb56d00c1163a7.zip | |
r25616: Fedora DS now has a way to install the schema and extra configuration
as part of the setup inf file.
Andrew Bartlett
(This used to be commit 6c8987464e198430885b9e71b54fed6758886fdd)
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/fedorads.inf | 4 | ||||
| -rwxr-xr-x | source4/setup/provision-backend | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source4/setup/fedorads.inf b/source4/setup/fedorads.inf index 8aed0338fb..fe51d01db1 100644 --- a/source4/setup/fedorads.inf +++ b/source4/setup/fedorads.inf @@ -24,4 +24,6 @@ ldif_dir= ${LDAPDIR}/slapd-samba4/ldif cert_dir= ${LDAPDIR}/slapd-samba4 start_server= 0 -install_full_schema= 0
\ No newline at end of file +install_full_schema= 0 +SchemaFile=${LDAPDIR}/99_ad.ldif +ConfigFile = ${LDAPDIR}/fedorads-partitions.ldif diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index 208869c930..b713595a7e 100755 --- a/source4/setup/provision-backend +++ b/source4/setup/provision-backend @@ -97,11 +97,11 @@ sys.mkdir(subobj.LDAPDIR, 0700); provision_schema(subobj, message, tmp_schema_ldb, paths); var mapping; -var ext; +var backend_schema; var slapd_command; if (options["ldap-backend-type"] == "fedora-ds") { mapping = "schema-map-fedora-ds-1.0"; - ext = "ldif"; + backend_schema = "backend-schema.ldif"; if (options["ldap-backend-port"] != undefined) { message("Will listen on TCP port " + options["ldap-backend-port"] + "\n"); subobj.SERVERPORT="ServerPort = " + options["ldap-backend-port"]; @@ -116,7 +116,7 @@ if (options["ldap-backend-type"] == "fedora-ds") { } else if (options["ldap-backend-type"] == "openldap") { provision_ldapbase(subobj, message, paths); mapping = "schema-map-openldap-2.3"; - ext = "schema"; + backend_schema = "99_ad.ldif"; setup_file("slapd.conf", message, subobj.LDAPDIR + "/slapd.conf", subobj); setup_file("modules.conf", message, subobj.LDAPDIR + "/modules.conf", subobj); sys.mkdir(subobj.LDAPDIR + "/db", 0700); @@ -142,7 +142,7 @@ if (options["ldap-backend-type"] == "fedora-ds") { slapd_command = "slapd -f " + subobj.LDAPDIR + "/slapd.conf -h " + subobj.LDAPI_URI; } } -var schema_command = "ad2oLschema --option=convert:target=" + options["ldap-backend-type"] + " -I " + lp.get("setup directory") + "/" + mapping + " -H tdb://" + tmp_schema_ldb + " -O " + subobj.LDAPDIR + "/backend-schema." + ext; +var schema_command = "ad2oLschema --option=convert:target=" + options["ldap-backend-type"] + " -I " + lp.get("setup directory") + "/" + mapping + " -H tdb://" + tmp_schema_ldb + " -O " + subobj.LDAPDIR + "/" + backend_schema; message("\nCreate a suitable schema file with:\n%s\n", schema_command); message("\nStart slapd with: \n%s\n", slapd_command); |