diff options
| -rwxr-xr-x | install/tools/ipa-server-install | 68 | ||||
| -rw-r--r-- | ipaserver/install/cainstance.py | 3 |
2 files changed, 64 insertions, 7 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index a2e9c7a38..809d69a7b 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -36,6 +36,7 @@ import shutil import glob import traceback from optparse import OptionParser +from ConfigParser import RawConfigParser import random from ipaserver.install import dsinstance @@ -170,6 +171,59 @@ def signal_handler(signum, frame): dsinstance.erase_ds_instance_data (ds.serverid) sys.exit(1) +ANSWER_CACHE = "/root/.ipa_cache" + +def read_cache(): + """ + Returns a dict of cached answers or None if no cache file exists. + """ + if not ipautil.file_exists(ANSWER_CACHE): + return {} + + optdict={} + parser = RawConfigParser() + try: + fp = open(ANSWER_CACHE, "r") + parser.readfp(fp) + optlist = parser.items('options') + fp.close() + + # this is one-use only + os.remove(ANSWER_CACHE) + except IOError, e: + raise RuntimeError("Unable to determine serial number: %s" % str(e)) + + for opt in optlist: + optdict[opt[0]] = opt[1] + if optdict[opt[0]] == 'None': + optdict[opt[0]] = None + + # These are the only ones that may be overridden + if 'external_ca_file' in optdict: + del optdict['external_ca_file'] + if 'external_cert_file' in optdict: + del optdict['external_cert_file'] + + return optdict + +def write_cache(options): + """ + Takes a dict as input and writes a cached file of answers + """ + + # convert the options instance into a dict + optdict = eval(str(options)) + parser = RawConfigParser() + try: + fp = open(ANSWER_CACHE, "w") + parser.add_section('options') + for opt in optdict: + parser.set('options', opt, optdict[opt]) + parser.write(fp) + fp.close() + except IOError, e: + raise RuntimeError("Unable to cache command-line options %s" % str(e)) + def read_host_name(host_default,no_host_dns=False): host_name = "" @@ -388,6 +442,10 @@ def uninstall(ca = False): krbinstance.KrbInstance(fstore).uninstall() dsinstance.DsInstance().uninstall() fstore.restore_all_files() + try: + os.remove(ANSWER_CACHE) + except Exception: + pass return 0 @@ -445,6 +503,9 @@ def main(): return uninstall(not certs.ipa_self_signed()) + # This will override any settings passed in on the cmdline + options._update_loose(read_cache()) + print "==============================================================================" print "This program will setup the FreeIPA Server." print "" @@ -614,12 +675,6 @@ def main(): os.close(pw_fd) if options.ca: - try: - from ipaserver.install import cainstance - except ImportError: - print >> sys.stderr, "Import failed: %s" % sys.exc_value - sys.exit(1) - # Clean up any previous self-signed CA that may exist try: os.remove(certs.CA_SERIALNO) @@ -650,6 +705,7 @@ def main(): if external == 0: ca.configure_instance("pkiuser", host_name, dm_password, dm_password) elif external == 1: + write_cache(options) ca.configure_instance("pkiuser", host_name, dm_password, dm_password, csr_file="/root/ipa.csr") else: ca.configure_instance("pkiuser", host_name, dm_password, dm_password, cert_file=options.external_cert_file, cert_chain_file=options.external_ca_file) diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index d07e58295..7a50d3538 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -604,7 +604,8 @@ class CAInstance(service.Service): ipautil.run(args) if self.external == 1: - print "The next step is to get %s signed by your CA and re-run ipa-server-install" % self.csr_file + 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 --ca --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 |