From 8495af1a50faca496fe2ce425b9b3a7f21ba1ea6 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 1 Aug 2011 15:16:24 -0400 Subject: Re-arrange CA configuration code to reduce the number of restarts. Ade Lee from the dogtag team looked at the configuration code and determined that a number of restarts were not needed and recommended re-arranging other code to reduce the number of restarts to one. https://fedorahosted.org/freeipa/ticket/1555 --- install/tools/ipa-ca-install | 3 --- install/tools/ipa-replica-install | 3 --- install/tools/ipa-server-install | 3 --- 3 files changed, 9 deletions(-) (limited to 'install/tools') diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index e6adae057..7bbba4b14 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -144,9 +144,6 @@ def main(): cs.add_simple_service('dogtagldap/%s@%s' % (config.host_name, config.realm_name)) cs.add_cert_to_service() - service.print_msg("Setting the certificate subject base") - CA.set_subject_in_config(util.realm_to_suffix(config.realm_name)) - try: if not os.geteuid()==0: sys.exit("\nYou must be root to run this script.\n") diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 6531421ab..f13b51eaf 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -433,9 +433,6 @@ def main(): CA.import_ra_cert(dir + "/ra.p12") CA.fix_ra_perms() service.restart("httpd") - if config.setup_ca: - service.print_msg("Setting the certificate subject base") - CA.set_subject_in_config(util.realm_to_suffix(config.realm_name)) # The DS instance is created before the keytab, add the SSL cert we # generated diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 564d8a88a..98941efe0 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -900,9 +900,6 @@ def main(): ipautil.run(["/sbin/restorecon", "/var/cache/ipa/sessions"]) set_subject_in_config(realm_name, dm_password, util.realm_to_suffix(realm_name), options.subject) - if not options.selfsign: - service.print_msg("Setting the certificate subject base") - ca.set_subject_in_config(util.realm_to_suffix(realm_name)) # Apply any LDAP updates. Needs to be done after the configuration file # is created -- cgit