diff options
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/script/mkrelease.sh | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 2 | ||||
| -rwxr-xr-x | source4/setup/provision | 14 |
3 files changed, 14 insertions, 4 deletions
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index 110988d0b6..94bd9d25cf 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -12,7 +12,7 @@ TMPDIR=`mktemp -d samba-XXXXX` #Prepare the tarball for a Samba4 release, with some generated files, #but without Samba3 stuff (to avoid confusion) ( cd $TMPDIR/ || exit 1 - rm -rf source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS || exit 1 + rm -rf README Manifest Read-Manifest-Now Roadmap source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS || exit 1 cd source4 || exit 1 ./autogen.sh || exit 1 ./configure || exit 1 diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 70bd8ac7f6..2da54ef14b 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1405,7 +1405,7 @@ def provision_backend(setup_dir=None, message=None, message("LDAP admin password: %s" % adminpass) message(slapdcommand) - message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" + ldap_backend_type + " --password=" + adminpass + " " + ldapuser) + message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" + ldap_backend_type + " --password=" + adminpass + " " + ldapuser + "--realm=" + names.dnsdomain + " --domain=" + names.domain + " --server-role='" + serverrole + "'") def create_phpldapadmin_config(path, setup_path, ldapi_uri): """Create a PHP LDAP admin configuration file. diff --git a/source4/setup/provision b/source4/setup/provision index 55a438cb65..55535cfd4a 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -129,8 +129,18 @@ if opts.interactive: else: print "%s: " % (prompt,), return sys.stdin.readline().rstrip("\n") or default - opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper()) - opts.domain = ask("Domain", opts.realm.split(".")[0]) + try: + opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper()) + except IndexError: + print >>sys.stderr, "Cannot guess realm from %s" % ( socket.getfqdn()) + sys.exit(1) + + try: + opts.domain = ask("Domain", opts.realm.split(".")[0]) + except IndexError: + print >>sys.stderr, "Cannot guess domain from %s" % ( opts.realm()) + sys.exit(1) + opts.server_role = ask("Server Role (dc, member, standalone)", "dc") for i in range(3): opts.adminpass = getpass("Administrator password: ") |