sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

expand tabs in python file, consistent with the rest of the file.

Browse Source
This commit is contained in:
Jelmer Vernooij
2009-02-24 01:00:09 +01:00
parent 10c047c6f4
commit dcb2e7d577
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,9 +93,9 @@ class ProvisionPaths(object):
self.memberofconf = None self.memberofconf = None
self.fedoradsinf = None self.fedoradsinf = None
self.fedoradspartitions = None self.fedoradspartitions = None
self.olmmron = None self.olmmron = None
self.olmmrserveridsconf = None self.olmmrserveridsconf = None
self.olmmrsyncreplconf = None self.olmmrsyncreplconf = None
class ProvisionNames(object): class ProvisionNames(object):
@ -1178,7 +1178,7 @@ def provision_backend(setup_dir=None, message=None,
rootdn=None, domaindn=None, schemadn=None, configdn=None, rootdn=None, domaindn=None, schemadn=None, configdn=None,
domain=None, hostname=None, adminpass=None, root=None, serverrole=None, domain=None, hostname=None, adminpass=None, root=None, serverrole=None,
ldap_backend_type=None, ldap_backend_port=None, ldap_backend_type=None, ldap_backend_port=None,
ol_mmr_urls=None): ol_mmr_urls=None):
def setup_path(file): def setup_path(file):
return os.path.join(setup_dir, file) return os.path.join(setup_dir, file)
@ -1300,50 +1300,50 @@ def provision_backend(setup_dir=None, message=None,
{ "LINK_ATTRS" : refint_attributes}) { "LINK_ATTRS" : refint_attributes})
# generate serverids, ldap-urls and syncrepl-blocks for mmr hosts # generate serverids, ldap-urls and syncrepl-blocks for mmr hosts
mmr_on_config = "" mmr_on_config = ""
mmr_replicator_acl = "" mmr_replicator_acl = ""
mmr_serverids_config = "" mmr_serverids_config = ""
mmr_syncrepl_schema_config = "" mmr_syncrepl_schema_config = ""
mmr_syncrepl_config_config = "" mmr_syncrepl_config_config = ""
mmr_syncrepl_user_config = "" mmr_syncrepl_user_config = ""
if ol_mmr_urls is not None: if ol_mmr_urls is not None:
# For now, make these equal # For now, make these equal
mmr_pass = adminpass mmr_pass = adminpass
url_list=filter(None,ol_mmr_urls.split(' ')) url_list=filter(None,ol_mmr_urls.split(' '))
if (len(url_list) == 1): if (len(url_list) == 1):
url_list=filter(None,ol_mmr_urls.split(',')) url_list=filter(None,ol_mmr_urls.split(','))
mmr_on_config = "MirrorMode On" mmr_on_config = "MirrorMode On"
mmr_replicator_acl = " by dn=cn=replicator,cn=samba read" mmr_replicator_acl = " by dn=cn=replicator,cn=samba read"
serverid=0 serverid=0
for url in url_list: for url in url_list:
serverid=serverid+1 serverid=serverid+1
mmr_serverids_config += read_and_sub_file(setup_path("mmr_serverids.conf"), mmr_serverids_config += read_and_sub_file(setup_path("mmr_serverids.conf"),
{ "SERVERID" : str(serverid), { "SERVERID" : str(serverid),
"LDAPSERVER" : url }) "LDAPSERVER" : url })
rid=serverid*10 rid=serverid*10
rid=rid+1 rid=rid+1
mmr_syncrepl_schema_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"), mmr_syncrepl_schema_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
{ "RID" : str(rid), { "RID" : str(rid),
"MMRDN": names.schemadn, "MMRDN": names.schemadn,
"LDAPSERVER" : url, "LDAPSERVER" : url,
"MMR_PASSWORD": mmr_pass}) "MMR_PASSWORD": mmr_pass})
rid=rid+1 rid=rid+1
mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"), mmr_syncrepl_config_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
{ "RID" : str(rid), { "RID" : str(rid),
"MMRDN": names.configdn, "MMRDN": names.configdn,
"LDAPSERVER" : url, "LDAPSERVER" : url,
"MMR_PASSWORD": mmr_pass}) "MMR_PASSWORD": mmr_pass})
rid=rid+1 rid=rid+1
mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"), mmr_syncrepl_user_config += read_and_sub_file(setup_path("mmr_syncrepl.conf"),
{ "RID" : str(rid), { "RID" : str(rid),
"MMRDN": names.domaindn, "MMRDN": names.domaindn,
"LDAPSERVER" : url, "LDAPSERVER" : url,
"MMR_PASSWORD": mmr_pass }) "MMR_PASSWORD": mmr_pass })
@ -1361,7 +1361,7 @@ def provision_backend(setup_dir=None, message=None,
"MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config, "MMR_SYNCREPL_CONFIG_CONFIG": mmr_syncrepl_config_config,
"MMR_SYNCREPL_USER_CONFIG": mmr_syncrepl_user_config, "MMR_SYNCREPL_USER_CONFIG": mmr_syncrepl_user_config,
"REFINT_CONFIG": refint_config}) "REFINT_CONFIG": refint_config})
setup_file(setup_path("modules.conf"), paths.modulesconf, setup_file(setup_path("modules.conf"), paths.modulesconf,
{"REALM": names.realm}) {"REALM": names.realm})
setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "user")) setup_db_config(setup_path, os.path.join(paths.ldapdir, "db", "user"))
@ -1380,9 +1380,9 @@ def provision_backend(setup_dir=None, message=None,
{"LDAPADMINPASS_B64": b64encode(adminpass), {"LDAPADMINPASS_B64": b64encode(adminpass),
"UUID": str(uuid.uuid4()), "UUID": str(uuid.uuid4()),
"LDAPTIME": timestring(int(time.time()))} ) "LDAPTIME": timestring(int(time.time()))} )
if ol_mmr_urls is not None: if ol_mmr_urls is not None:
setup_file(setup_path("cn=replicator.ldif"), setup_file(setup_path("cn=replicator.ldif"),
os.path.join(paths.ldapdir, "db", "samba", "cn=samba", "cn=replicator.ldif"), os.path.join(paths.ldapdir, "db", "samba", "cn=samba", "cn=replicator.ldif"),
{"MMR_PASSWORD_B64": b64encode(mmr_pass), {"MMR_PASSWORD_B64": b64encode(mmr_pass),
"UUID": str(uuid.uuid4()), "UUID": str(uuid.uuid4()),