diff options
| author | Tomas Babej <tbabej@redhat.com> | 2013-10-09 13:20:13 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-10-14 11:11:17 +0200 |
| commit | d769b124b0aa4b58cccbee2dd04c2bb9063fbae7 (patch) | |
| tree | fcb25098fe9302ec3cefe43e98df81ab0d127019 /install/tools/ipa-server-install | |
| parent | 45e310ecc45bbf0c4656b3f46ad4aa659af928de (diff) | |
| download | freeipa-d769b124b0aa4b58cccbee2dd04c2bb9063fbae7.tar.gz freeipa-d769b124b0aa4b58cccbee2dd04c2bb9063fbae7.tar.xz freeipa-d769b124b0aa4b58cccbee2dd04c2bb9063fbae7.zip | |
adtrustinstance: Properly handle uninstall of AD trust instance
The uninstall method of the AD trust instance was not called upon
at all in the ipa-server-install --uninstall phase.
This patch makes sure that AD trust instance is unconfigured when
the server is uninstalled.
The following steps are undertaken:
* Remove /var/run/samba/krb5cc_samba
* Remove our keys from /etc/samba/samba.keytab using ipa-rmkeytab
* Remove /var/lib/samba/*.tdb files
Additionally, we make sure winbind service is stopped from within the
stop() method.
Part of: https://fedorahosted.org/freeipa/ticket/3479
Diffstat (limited to 'install/tools/ipa-server-install')
| -rw-r--r-- | install/tools/ipa-server-install | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index b871ef3f2..cf769f557 100644 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -40,6 +40,7 @@ import pwd import textwrap from optparse import OptionGroup, OptionValueError +from ipaserver.install import adtrustinstance from ipaserver.install import dsinstance from ipaserver.install import krbinstance from ipaserver.install import bindinstance @@ -492,6 +493,7 @@ def uninstall(): httpinstance.HTTPInstance(fstore).uninstall() krbinstance.KrbInstance(fstore).uninstall() dsinstance.DsInstance(fstore=fstore).uninstall() + adtrustinstance.ADTRUSTInstance(fstore).uninstall() memcacheinstance.MemcacheInstance().uninstall() otpdinstance.OtpdInstance().uninstall() ipaservices.restore_network_configuration(fstore, sstore) |