sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

Update OpenLDAP MMR configuration per comments by Oliver Liebel

Browse Source 
<oliver@itc.li>

This changes the RIDs to be <serverID><DBID>, to ease later debugging.

The need to specify the port on the MMR URLs is now included in the
help.

Andrew Bartlett
(This used to be commit a5cbe8c09c6f14f95ff9ba9b8782e2100fc55695)
This commit is contained in:
Andrew Bartlett 2008-08-20 12:21:36 +10:00
parent b33f4541f6
commit 41493cbe68
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source4/scripting/python/samba/provision.py
View File

@ -1281,39 +1281,38 @@ def provision_backend(setup_dir=None, message=None,
mmr_syncrepl_user_config = ""
if ol_mmr_urls is not None:
mmr_hosts=filter(None,ol_mmr_urls.split(' '))
if (len(mmr_hosts) == 1):
mmr_hosts=filter(None,ol_mmr_urls.split(','))
url_list=filter(None,ol_mmr_urls.split(' '))
if (len(url_list) == 1):
url_list=filter(None,ol_mmr_urls.split(','))
mmr_on_config = "MirrorMode On"
z=0
for i in mmr_hosts:
z=z+1
serverid=0
for url in url_list:
serverid=serverid+1
mmr_serverids_config += read_and_sub_file(setup_path("mmr_serverids.conf"),
{ "SERVERID" : str(z),
"LDAPSERVER" : i })
z=z+1
{ "SERVERID" : str(serverid),
"LDAPSERVER" : url })
rid=serverid*10
rid=rid+1
mmr_syncrepl_schema_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
{ "RID" : str(z),
{ "RID" : str(rid),
"MMRDN": names.schemadn,
"LDAPSERVER" : i,
"LDAPSERVER" : url,
"MMR_PASSWORD": adminpass})
z=z+1
rid=rid+1
mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
{ "RID" : str(z),
{ "RID" : str(rid),
"MMRDN": names.configdn,
"LDAPSERVER" : i,
"LDAPSERVER" : url,
"MMR_PASSWORD": adminpass})
z=z+1
rid=rid+1
mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
{ "RID" : str(z),
{ "RID" : str(rid),
"MMRDN": names.domaindn,
"LDAPSERVER" : i,
"LDAPSERVER" : url,
"MMR_PASSWORD": adminpass })

2
source4/setup/provision-backend
View File

@ -65,7 +65,7 @@ parser.add_option("--server-role", type="choice", metavar="ROLE",
parser.add_option("--targetdir", type="string", metavar="DIR",
help="Set target directory")
parser.add_option("--ol-mmr-urls", type="string", metavar="LDAPSERVER",
help="List of LDAP-URLS separated with whitespaces for Use with OpenLDAP-MMR")
help="List of LDAP-URLS [ ldap://<FQDN>:port/ (where port != 389) ] separated with whitespaces for use with OpenLDAP-MMR")
opts = parser.parse_args()[0]