summaryrefslogtreecommitdiffstats
path: root/install/tools/ipa-server-install
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2014-04-16 11:20:29 -0400
committerAde Lee <alee@redhat.com>2014-05-27 14:51:50 -0400
commit462629bab3163be47b2fc6d79b88781f82fdaf15 (patch)
tree759df0069974df031577338dafc658ab3c2a5556 /install/tools/ipa-server-install
parent2139db9cb9c05ed84b4c39c50091462fdaff4b6c (diff)
downloadfreeipa-462629bab3163be47b2fc6d79b88781f82fdaf15.tar.gz
freeipa-462629bab3163be47b2fc6d79b88781f82fdaf15.tar.xz
freeipa-462629bab3163be47b2fc6d79b88781f82fdaf15.zip
Added nolog to pkispawn and some additional fixes from review.
Diffstat (limited to 'install/tools/ipa-server-install')
-rwxr-xr-xinstall/tools/ipa-server-install2
1 files changed, 2 insertions, 0 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 440d108a6..2ab4e68bc 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -503,6 +503,7 @@ def uninstall():
ca_instance = cainstance.CAInstance(
api.env.realm, certs.NSS_DIR, dogtag_constants=dogtag_constants)
ca_instance.stop_tracking_certificates(dogtag_constants)
+ ca_instance.stop_tracking_agent_certificate(dogtag_constants)
if ca_instance.is_configured():
ca_instance.uninstall()
@@ -762,6 +763,7 @@ def main():
# We only set up the CA if the PKCS#12 options are not given.
if options.dirsrv_pkcs12:
setup_ca = False
+ setup_drm = False
else:
setup_ca = True
setup_drm = True