The branch, master has been updated via 803dc38 s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL via 83c149d s4:provision: add a server services line to the smb.conf template for the dc via f489c68 s4:provision: add the possibility to provision "server services" in smb.conf via a876d51 s4:provision: improve a message from 0f79184 samba: check for AES encryption type defines.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 803dc389d1ade89708a3fedc91dd2c271f4a495b Author: Michael Adam <ob...@samba.org> Date: Sun Jan 8 01:02:58 2012 +0100 s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL Signed-off-by: Kai Blin <k...@samba.org> Autobuild-User: Kai Blin <k...@samba.org> Autobuild-Date: Tue Jan 10 21:17:45 CET 2012 on sn-devel-104 commit 83c149de4d7ba91f799959bc411516fd163917df Author: Michael Adam <ob...@samba.org> Date: Thu Jan 5 00:45:12 2012 +0100 s4:provision: add a server services line to the smb.conf template for the dc Signed-off-by: Kai Blin <k...@samba.org> commit f489c681ea4dcdf13c62876cb0e21ca93882599b Author: Michael Adam <ob...@samba.org> Date: Thu Jan 5 00:44:39 2012 +0100 s4:provision: add the possibility to provision "server services" in smb.conf Signed-off-by: Kai Blin <k...@samba.org> commit a876d519fedc50ad4958ae772a2b836f00dcea48 Author: Michael Adam <ob...@samba.org> Date: Thu Jan 5 00:05:26 2012 +0100 s4:provision: improve a message Signed-off-by: Kai Blin <k...@samba.org> ----------------------------------------------------------------------- Summary of changes: .../scripting/python/samba/provision/__init__.py | 22 +++++++++++++++---- source4/setup/provision.smb.conf.dc | 2 + 2 files changed, 19 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 5c4866c..295e272 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -554,7 +554,8 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, def make_smbconf(smbconf, hostname, domain, realm, serverrole, - targetdir, sid_generator="internal", eadb=False, lp=None): + targetdir, sid_generator="internal", eadb=False, lp=None, + server_services=None): """Create a new smb.conf file based on a couple of basic settings. """ assert smbconf is not None @@ -603,6 +604,11 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole, privdir = lp.get("private dir") lp.set("posix:eadb", os.path.abspath(os.path.join(privdir, "eadb.tdb"))) + if server_services is not None: + server_services_line = "server services = " + " ".join(server_services) + else: + server_services_line = "" + if targetdir is not None: privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private")) lockdir_line = "lock dir = " + os.path.abspath(targetdir) @@ -632,7 +638,8 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole, "PRIVATEDIR_LINE": privatedir_line, "LOCKDIR_LINE": lockdir_line, "STATEDIR_LINE": statedir_line, - "CACHEDIR_LINE": cachedir_line + "CACHEDIR_LINE": cachedir_line, + "SERVER_SERVICES_LINE": server_services_line }) # reload the smb.conf @@ -1586,6 +1593,10 @@ def provision(logger, session_info, credentials, smbconf=None, if not os.path.exists(os.path.dirname(smbconf)): os.makedirs(os.path.dirname(smbconf)) + server_services = None + if dns_backend == "SAMBA_INTERNAL": + server_services = [ "+dns" ] + # only install a new smb.conf if there isn't one there already if os.path.exists(smbconf): # if Samba Team members can't figure out the weird errors @@ -1596,10 +1607,11 @@ def provision(logger, session_info, credentials, smbconf=None, if data is None or data == "": make_smbconf(smbconf, hostname, domain, realm, serverrole, targetdir, sid_generator, useeadb, - lp=lp) + lp=lp, server_services=server_services) else: make_smbconf(smbconf, hostname, domain, realm, serverrole, - targetdir, sid_generator, useeadb, lp=lp) + targetdir, sid_generator, useeadb, lp=lp, + server_services=server_services) if lp is None: lp = samba.param.LoadParm() @@ -1776,7 +1788,7 @@ def provision(logger, session_info, credentials, smbconf=None, logger.info("Failed to chown %s to bind gid %u", dns_keytab_path, paths.bind_gid) - logger.info("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php", + logger.info("A phpLDAPadmin configuration file suitable for administering the Samba 4 LDAP server has been created in %s .", paths.phpldapadminconfig) logger.info("Once the above files are installed, your Samba4 server will be ready to use") diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc index fd1ffd3..ba8555f 100644 --- a/source4/setup/provision.smb.conf.dc +++ b/source4/setup/provision.smb.conf.dc @@ -3,6 +3,8 @@ workgroup = ${DOMAIN} realm = ${REALM} server role = ${SERVERROLE} + ${SERVER_SERVICES_LINE} + ${PRIVATEDIR_LINE} ${LOCKDIR_LINE} ${STATEDIR_LINE} -- Samba Shared Repository