Revert to ejs for 'provision'

[samba.git] / source / setup / provision

diff --git a/source/setup/provision b/source/setup/provision
index bf03026987abc09e65f50e648cb501f81fcee3e0..9e135cddbb49207356041849b1fa89b681ae7009 100755 (executable)
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -123,7 +123,6 @@ for (r in options) {
 }
 
 var blank = (options["blank"] != undefined);
-var ldapbase = (options["ldap-base"] != undefined);
 var ldapbackend = (options["ldap-backend"] != undefined);
 var ldapmodule = (options["ldap-module"] != undefined);
 var partitions_only = (options["partitions-only"] != undefined);
@@ -141,14 +140,13 @@ if (ldapbackend) {
                subobj.LDAPBACKEND = subobj.LDAPI_URI;
        }
        if (!ldapmodule) {
-               subobj.LDAPMODULE = "entryUUID";
+               subobj.LDAPMODULE = "normalise,entryuuid";
+               subobj.TDB_MODULES_LIST = "";
        }
+       subobj.BACKEND_MOD = subobj.LDAPMODULE + ",paged_searches";
        subobj.DOMAINDN_LDB = subobj.LDAPBACKEND;
-       subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
        subobj.CONFIGDN_LDB = subobj.LDAPBACKEND;
-       subobj.CONFIGDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
        subobj.SCHEMADN_LDB = subobj.LDAPBACKEND;
-       subobj.SCHEMADN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
        message("LDAP module: %s on backend: %s\n", subobj.LDAPMODULE, subobj.LDAPBACKEND);
 }
 
@@ -160,10 +158,7 @@ var system_session = system_session();
 var creds = options.get_credentials();
 message("Provisioning for %s in realm %s\n", subobj.DOMAIN, subobj.REALM);
 message("Using administrator password: %s\n", subobj.ADMINPASS);
-if (ldapbase) {
-       provision_ldapbase(subobj, message, paths);
-       message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server\n");
-} else if (partitions_only) {
+if (partitions_only) {
        provision_become_dc(subobj, message, false, paths, system_session);
 } else {
        provision(subobj, message, blank, paths, system_session, creds, ldapbackend);
@@ -178,16 +173,18 @@ if (ldapbase) {
                 message("--host-guid='%s' \\\n", subobj.HOSTGUID);
        }
        message("--policy-guid='%s' --host-name='%s' --host-ip='%s' \\\n", subobj.POLICYGUID, subobj.HOSTNAME, subobj.HOSTIP);
-       message("--invocationid='%s' \\\n", subobj.INVOCATIONID);
+       if (subobj.INVOCATIONID != undefined) {
+               message("--invocationid='%s' \\\n", subobj.INVOCATIONID);
+       }
        message("--adminpass='%s' --krbtgtpass='%s' \\\n", subobj.ADMINPASS, subobj.KRBTGTPASS);
        message("--machinepass='%s' --dnspass='%s' \\\n", subobj.MACHINEPASS, subobj.DNSPASS);
-       message("--root='%s' --nobody='%s' --nogroup-'%s' \\\n", subobj.ROOT, subobj.NOBODY, subobj.NOGROUP);
+       message("--root='%s' --nobody='%s' --nogroup='%s' \\\n", subobj.ROOT, subobj.NOBODY, subobj.NOGROUP);
        message("--wheel='%s' --users='%s' --server-role='%s' \\\n", subobj.WHEEL, subobj.USERS, subobj.SERVERROLE);
        if (ldapbackend) {
                message("--ldap-backend='%s' \\\n", subobj.LDAPBACKEND);
        }
        if (ldapmodule) {
-               message("--ldap-mdoule='%s' \\\n", + subobj.LDAPMODULE);
+               message("--ldap-module='%s' \\\n", + subobj.LDAPMODULE);
        }
        message("--aci='" + subobj.ACI + "' \\\n")
 }