Setup bind only after restarting kdc and dirsrv

BIND starting before we apply LDAP updates and restart kdc and directory
server causes trouble. We resolve this for now by postponing BIND setup
to the end of installation. Another reason is that we will be using
xml-rpc during the setup in the future.
This commit is contained in:
Martin Nagy 2009-09-02 12:24:17 +02:00
parent 4e5a68397a
commit fbda06269d
2 changed files with 11 additions and 10 deletions

View File

@ -310,8 +310,6 @@ def main():
install_krb(config) install_krb(config)
install_http(config) install_http(config)
if options.setup_dns:
install_bind(config)
if CA: if CA:
CA.import_ra_cert(dir + "/ra.p12") CA.import_ra_cert(dir + "/ra.p12")
CA.fix_ra_perms() CA.fix_ra_perms()
@ -344,6 +342,9 @@ def main():
service.restart("dirsrv") service.restart("dirsrv")
service.restart("krb5kdc") service.restart("krb5kdc")
if options.setup_dns:
install_bind(config, options)
# Call client install script # Call client install script
try: try:
ipautil.run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name]) ipautil.run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name])

View File

@ -633,14 +633,6 @@ def main():
fd.write("enable_ra=True\n") fd.write("enable_ra=True\n")
fd.close() fd.close()
# Create a BIND instance
bind = bindinstance.BindInstance(fstore, dm_password)
bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders)
if options.setup_dns:
bind.create_instance()
else:
bind.create_sample_bind_zone()
# Apply any LDAP updates. Needs to be done after the configuration file # Apply any LDAP updates. Needs to be done after the configuration file
# is created # is created
service.print_msg("Applying LDAP updates") service.print_msg("Applying LDAP updates")
@ -653,6 +645,14 @@ def main():
service.print_msg("restarting the KDC") service.print_msg("restarting the KDC")
krb.restart() krb.restart()
# Create a BIND instance
bind = bindinstance.BindInstance(fstore, dm_password)
bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders)
if options.setup_dns:
bind.create_instance()
else:
bind.create_sample_bind_zone()
# Set the admin user kerberos password # Set the admin user kerberos password
ds.change_admin_password(admin_password) ds.change_admin_password(admin_password)