diff options
author | Martin Nagy <mnagy@redhat.com> | 2010-02-08 14:21:46 +0100 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2010-02-09 16:30:06 -0500 |
commit | 206d2d48fab45072af4660f9692dd5b8643b4c4d (patch) | |
tree | 118cd597bc3cf67f947a910c7e610840d7359630 /install/tools/ipa-replica-install | |
parent | b05f94fb4c747d924fe5c89472663ba9226d2db1 (diff) | |
download | freeipa-206d2d48fab45072af4660f9692dd5b8643b4c4d.tar.gz freeipa-206d2d48fab45072af4660f9692dd5b8643b4c4d.tar.xz freeipa-206d2d48fab45072af4660f9692dd5b8643b4c4d.zip |
Get rid of ipapython.config in ipa-replica-prepare
Also get rid of functions get_host_name(), get_realm_name() and
get_domain_name(). They used the old ipapython.config. Instead, use the
variables from api.env. We also change them to bootstrap() and
finalize() correctly.
Additionally, we add the dns_container_exists() function that will be
used in ipa-replica-prepare (next patch).
Diffstat (limited to 'install/tools/ipa-replica-install')
-rwxr-xr-x | install/tools/ipa-replica-install | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index af7128cf4..4b348f641 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -311,12 +311,21 @@ def main(): except ldap.INVALID_CREDENTIALS, e : sys.exit("\nThe password provided is incorrect for LDAP server %s" % config.master_host_name) + # Create the management framework config file + # Note: We must do this before bootstraping and finalizing ipalib.api + fd = open("/etc/ipa/default.conf", "w") + fd.write("[global]\n") + fd.write("basedn=" + util.realm_to_suffix(config.realm_name) + "\n") + fd.write("realm=" + config.realm_name + "\n") + fd.write("domain=" + config.domain_name + "\n") + fd.write("xmlrpc_uri=https://%s/ipa/xml\n" % config.host_name) + fd.write("ldap_uri=ldapi://%%2fvar%%2frun%%2fslapd-%s.socket\n" % dsinstance.realm_to_serverid(config.realm_name)) if ipautil.file_exists(config.dir + "/ca.p12"): - ca_type = 'dogtag' - else: - ca_type = 'selfsign' + fd.write("enable_ra=True\n") + fd.write("ra_plugin=dogtag\n") + fd.close() - api.bootstrap(in_server=True, ra_plugin=ca_type) + api.bootstrap(in_server=True) api.finalize() # Install CA cert so that we can do SSL connections with ldap @@ -355,19 +364,6 @@ def main(): # generated ds.add_cert_to_service() - # Create the management framework config file - fd = open("/etc/ipa/default.conf", "w") - fd.write("[global]\n") - fd.write("basedn=" + util.realm_to_suffix(config.realm_name) + "\n") - fd.write("realm=" + config.realm_name + "\n") - fd.write("domain=" + config.domain_name + "\n") - fd.write("xmlrpc_uri=https://%s/ipa/xml\n" % config.host_name) - fd.write("ldap_uri=ldapi://%%2fvar%%2frun%%2fslapd-%s.socket\n" % dsinstance.realm_to_serverid(config.realm_name)) - if ipautil.file_exists(config.dir + "/ca.p12"): - fd.write("enable_ra=True\n") - fd.write("ra_plugin=dogtag\n") - fd.close() - # Apply any LDAP updates. Needs to be done after the replica is synced-up service.print_msg("Applying LDAP updates") ds.apply_updates() |