summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to 'install')
-rwxr-xr-xinstall/tools/ipa-server-install9
1 files changed, 8 insertions, 1 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index c5b3333b9..c8a17c99d 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -383,6 +383,13 @@ def check_dirsrv(unattended):
def uninstall():
+ print "Shutting down all IPA services"
+ try:
+ (stdout, stderr, rc) = run(["/usr/sbin/ipactl", "stop"], raiseonerr=False)
+ except Exception, e:
+ pass
+
+ print "Removing IPA client configuration"
try:
(stdout, stderr, rc) = run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--uninstall"], raiseonerr=False)
if rc not in [0,2]:
@@ -681,7 +688,7 @@ def main():
if options.external_cert_file is None:
cs = cainstance.CADSInstance()
- cs.create_instance(ds_user, realm_name, host_name, domain_name, dm_password)
+ cs.create_instance("pkisrv", realm_name, host_name, domain_name, dm_password)
ca = cainstance.CAInstance()
if external == 0:
ca.configure_instance("pkiuser", host_name, dm_password, dm_password, subject_base=options.subject)