diff options
author | Jan Cholasta <jcholast@redhat.com> | 2014-06-16 10:41:57 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2014-07-30 16:04:21 +0200 |
commit | d27e77adc56f5a04f3bdd1aaed5440a89ed3acad (patch) | |
tree | 2b1128a264eec58603a467521daefe7b2b75a9be /ipaserver | |
parent | 8bbdfff102849c0f573e56530a734643a568e0dd (diff) | |
download | freeipa-d27e77adc56f5a04f3bdd1aaed5440a89ed3acad.tar.gz freeipa-d27e77adc56f5a04f3bdd1aaed5440a89ed3acad.tar.xz freeipa-d27e77adc56f5a04f3bdd1aaed5440a89ed3acad.zip |
Allow upgrading CA-less to CA-full using ipa-ca-install.
Part of https://fedorahosted.org/freeipa/ticket/3737
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/install/cainstance.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index a3f692d9d..1d1e9a01c 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -618,8 +618,8 @@ class CAInstance(service.Service): os.remove(cfg_file) 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" + print "The next step is to get %s signed by your CA and re-run %s as:" % (self.csr_file, sys.argv[0]) + print "%s --external_cert_file=/path/to/signed_certificate --external_ca_file=/path/to/external_ca_certificate" % sys.argv[0] sys.exit(0) else: shutil.move(paths.CA_BACKUP_KEYS_P12, \ @@ -777,8 +777,8 @@ class CAInstance(service.Service): 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" + print "The next step is to get %s signed by your CA and re-run %s as:" % (self.csr_file, sys.argv[0]) + print "%s --external_cert_file=/path/to/signed_certificate --external_ca_file=/path/to/external_ca_certificate" % sys.argv[0] sys.exit(0) # pkisilent makes a copy of the CA PKCS#12 file for us but gives |