IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move the pki-tomcat restart to cainstance creation

Browse Source 
pki-tomcat would have been restarted in install and replicainstall
for backward compatibility reasons. As Dogtag 9 is not supported
anymore, we can move this restart only for DL0 replica installation.

https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Stanislav Laznicka 2016-11-07 09:48:52 +01:00 committed by Jan Cholasta
parent bde1d82ebe
commit ba4df6449a
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ipaserver/install/cainstance.py
View File

@ -423,6 +423,10 @@ class CAInstance(DogtagInstance):
configure_lightweight_ca_acls) configure_lightweight_ca_acls)
self.step("Ensure lightweight CAs container exists", self.step("Ensure lightweight CAs container exists",
ensure_lightweight_cas_container) ensure_lightweight_cas_container)
if self.clone and not promote:
self.step(
"Ensuring backward compatibility",
self.__dogtag10_migration)
self.step("configure certificate renewals", self.configure_renewal) self.step("configure certificate renewals", self.configure_renewal)
self.step("configure Server-Cert certificate renewal", self.track_servercert) self.step("configure Server-Cert certificate renewal", self.track_servercert)
self.step("Configure HTTP to proxy connections", self.step("Configure HTTP to proxy connections",
@ -1276,6 +1280,15 @@ class CAInstance(DogtagInstance):
root_logger.warning( root_logger.warning(
"Did not find any lightweight CAs; nothing to track") "Did not find any lightweight CAs; nothing to track")
def __dogtag10_migration(self):
ld = ldapupdate.LDAPUpdate(ldapi=True, sub_dict={
'SUFFIX': api.env.basedn,
'FQDN': self.fqdn,
})
ld.update([os.path.join(paths.UPDATES_DIR,
'50-dogtag10-migration.update')]
)
def replica_ca_install_check(config, promote): def replica_ca_install_check(config, promote):
if promote: if promote:

3
ipaserver/install/server/install.py
View File

@ -854,9 +854,6 @@ def install(installer):
service.print_msg("Restarting the KDC") service.print_msg("Restarting the KDC")
krb.restart() krb.restart()
if setup_ca:
services.knownservices['pki_tomcatd'].restart('pki-tomcat')
if options.setup_dns: if options.setup_dns:
dns.install(False, False, options) dns.install(False, False, options)
else: else:

3
ipaserver/install/server/replicainstall.py
View File

@ -935,9 +935,6 @@ def install(installer):
service.print_msg("Restarting the KDC") service.print_msg("Restarting the KDC")
krb.restart() krb.restart()
if config.setup_ca:
services.knownservices['pki_tomcatd'].restart('pki-tomcat')
if options.setup_dns: if options.setup_dns:
dns.install(False, True, options) dns.install(False, True, options)
else: else: