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

fixes CA install problem in trac ticket 682

Browse Source 
Do not call status after pkisilent, it will return non-zero.
Instead restart server after pkisilent so configuration
changes take effect, the check the status.
This commit is contained in:
John Dennis 2010-12-29 09:48:22 -05:00 committed by Rob Crittenden
parent b0bca88663
commit a7b926420f
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ipaserver/install/cainstance.py
View File

@ -584,28 +584,34 @@ class CAInstance(service.Service):
nolog = (self.admin_password, self.dm_password,)
ipautil.run(args, nolog=nolog)
if self.external == 1:
print "The next step is to get %s signed by your CA and re-run ipa-server-install as:" % self.csr_file
print "ipa-server-install --external_cert_file=/path/to/signed_certificate --external_ca_file=/path/to/external_ca_certificate"
sys.exit(0)
# pkisilent doesn't return 1 on error so look at the output of
# /sbin/service pki-cad status. It will tell us if the instance
# still needs to be configured.
(stdout, stderr, returncode) = ipautil.run(["/sbin/service", self.service_name, "status"])
try:
stdout.index("CONFIGURED!")
raise RuntimeError("pkisilent failed to configure instance.")
except ValueError:
# This is raised because the string doesn't exist, we're done
pass
logging.debug("completed creating ca instance")
except ipautil.CalledProcessError, e:
logging.critical("failed to restart ca instance %s" % e)
logging.critical("failed to configure ca instance %s" % e)
raise RuntimeError('Configuration of CA failed')
if self.external == 1:
print "The next step is to get %s signed by your CA and re-run ipa-server-install as:" % self.csr_file
print "ipa-server-install --external_cert_file=/path/to/signed_certificate --external_ca_file=/path/to/external_ca_certificate"
sys.exit(0)
try:
# After configuration the service is running and configured
# but must be restarted for configuration to take effect.
# The service status in this case will be 4.
self.restart()
except ipautil.CalledProcessError, e:
logging.critical("failed to restart ca instance after pkisilent configuration %s" % e)
raise RuntimeError('Restarting CA after pkisilent configuration failed')
# If the configuration was successful status should now be 0.
# We don't call is_running() because we want the exit status for debugging.
try:
ipautil.run(["/sbin/service", self.service_name, "status", PKI_INSTANCE_NAME])
except ipautil.CalledProcessError, e:
logging.critical("ca instance configuration not successful after restart %s" % e)
raise RuntimeError('CA configuration not successful after restart')
logging.debug("completed creating ca instance")
# Turn off Nonces (again)
if installutils.update_file('/var/lib/pki-ca/conf/CS.cfg', 'ca.enableNonces=true', 'ca.enableNonces=false') != 0:
raise RuntimeError("Disabling nonces failed")