diff options
| author | Simo Sorce <ssorce@redhat.com> | 2010-12-08 10:25:49 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2010-12-09 08:29:29 -0500 |
| commit | dea2167afa2ff15b77dc75d4186d8d0a0e32128b (patch) | |
| tree | 9c5358bac4d2f8ed437151343db17f3c0d3ec4eb /install | |
| parent | 5330280f087efdb44adfcc400db52e0a2eff5222 (diff) | |
| download | freeipa-dea2167afa2ff15b77dc75d4186d8d0a0e32128b.tar.gz freeipa-dea2167afa2ff15b77dc75d4186d8d0a0e32128b.tar.xz freeipa-dea2167afa2ff15b77dc75d4186d8d0a0e32128b.zip | |
Move ntp configuration up top.
Also move down some dsinstance related operation close to other dsinstance
operations.
Fixes: https://fedorahosted.org/freeipa/ticket/595
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-server-install | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index bed9add9c..32c9e8987 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -688,10 +688,10 @@ def main(): print "Please wait until the prompt is returned." print "" - if options.dirsrv_pin: - [pw_fd, pw_name] = tempfile.mkstemp() - os.write(pw_fd, options.dirsrv_pin) - os.close(pw_fd) + # Configure ntpd + if options.conf_ntp: + ntp = ntpinstance.NTPInstance(fstore) + ntp.create_instance() if not options.selfsign: # Clean up any previous self-signed CA that may exist @@ -735,13 +735,14 @@ def main(): else: ca.configure_instance("pkiuser", host_name, dm_password, dm_password, cert_file=options.external_cert_file, cert_chain_file=options.external_ca_file, subject_base=options.subject) - # Configure ntpd - if options.conf_ntp: - ntp = ntpinstance.NTPInstance(fstore) - ntp.create_instance() - # Create a directory server instance ds = dsinstance.DsInstance() + + if options.dirsrv_pin: + [pw_fd, pw_name] = tempfile.mkstemp() + os.write(pw_fd, options.dirsrv_pin) + os.close(pw_fd) + if options.dirsrv_pkcs12: pkcs12_info = (options.dirsrv_pkcs12, pw_name) try: |