summaryrefslogtreecommitdiffstats
path: root/install/tools/ipa-replica-prepare
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-11-22 13:29:56 -0500
committerSimo Sorce <ssorce@redhat.com>2010-12-08 09:54:13 -0500
commite1d6f9c6b94d96ca7d78a6eed64e9c705120d6fe (patch)
treeed559ff347857adcc46f890d1fe2b4a931e9f836 /install/tools/ipa-replica-prepare
parentdeb94b150dc48d3af2a461e7d325f7c68cceefef (diff)
downloadfreeipa-e1d6f9c6b94d96ca7d78a6eed64e9c705120d6fe.tar.gz
freeipa-e1d6f9c6b94d96ca7d78a6eed64e9c705120d6fe.tar.xz
freeipa-e1d6f9c6b94d96ca7d78a6eed64e9c705120d6fe.zip
Make pkinit setup optional in ipa-replica-prepare too.
Also add fixes for ipa-replica-install as that had issues too. Fixes: https://fedorahosted.org/freeipa/ticket/527
Diffstat (limited to 'install/tools/ipa-replica-prepare')
-rwxr-xr-xinstall/tools/ipa-replica-prepare5
1 files changed, 5 insertions, 0 deletions
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare
index af7680155..d70741f1a 100755
--- a/install/tools/ipa-replica-prepare
+++ b/install/tools/ipa-replica-prepare
@@ -242,6 +242,11 @@ def main():
api.bootstrap(in_server=True)
api.finalize()
+ #Automatically disable pkinit w/ dogtag until that is supported
+ #[certs.ipa_self_signed() must be called only after api.finalize()]
+ if not options.pkinit_pkcs12 and not certs.ipa_self_signed():
+ options.setup_pkinit = False
+
if options.ip_address:
if not bindinstance.dns_container_exists(api.env.host, api.env.realm):
print "You can't add a DNS record because DNS is not set up."