diff options
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-adtrust-install | 5 | ||||
| -rw-r--r-- | install/tools/ipa-server-install | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index badb483a..fe86a946 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -276,8 +276,9 @@ def main(): sys.exit("Aborting installation.") elif os.path.exists('/etc/samba/smb.conf'): - print("WARNING: The smb.conf already exists. Running ipa-adtrust-install - "will break your existing samba configuration.\n\n") + print("WARNING: The smb.conf already exists. Running " + "ipa-adtrust-install will break your existing samba " + "configuration.\n\n") if not options.unattended: if not ipautil.user_input("Do you wish to continue?", default = False, diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index b871ef3f..cf769f55 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) |