IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Forbid reinstallation in ipa-client-install

Browse Source 
The --force option may be misused to reinstall an existing IPA
client. This is not supported and may lead to unexpected errors.
When required, the cleanest way to re-install IPA client is to
run uninstall and then install again.

This patch also includes few cosmetic changes in messages to user
to provide more consistent user experience with the script.

https://fedorahosted.org/freeipa/ticket/1117
This commit is contained in:
Martin Kosek 2011-04-27 16:09:43 +02:00
parent 7811200c62
commit 2e99c60c8b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/tools/ipa-server-install
View File

@ -494,7 +494,8 @@ def main():
standard_logging_setup("/var/log/ipaserver-install.log", options.debug)
print "\nThe log file for this installation can be found in /var/log/ipaserver-install.log"
if (dsinstance.DsInstance().is_configured() or cainstance.CADSInstance().is_configured()) and not options.external_cert_file:
sys.exit("IPA server is already configured on this system.")
sys.exit("IPA server is already configured on this system.\n"
+ "If you want to reinstall the IPA server please uninstall it first.")
client_fstore = sysrestore.FileStore('/var/lib/ipa-client/sysrestore')
if client_fstore.has_files():

15
ipa-client/ipa-install/ipa-client-install
View File

@ -58,7 +58,7 @@ def parse_options():
parser.add_option("--server", dest="server", help="IPA server")
parser.add_option("--realm", dest="realm_name", help="realm name")
parser.add_option("-f", "--force", dest="force", action="store_true",
default=False, help="force setting of ldap/kerberos conf")
default=False, help="force setting of LDAP/Kerberos conf")
parser.add_option("-d", "--debug", dest="debug", action="store_true",
default=False, help="print debugging information")
parser.add_option("-U", "--unattended", dest="unattended",
@ -185,7 +185,7 @@ def chkconfig(name, status):
def uninstall(options, env):
if not fstore.has_files() and not options.force:
if not fstore.has_files():
print "IPA client is not configured on this system."
return 2
@ -271,11 +271,11 @@ def uninstall(options, env):
except:
print "Failed to clean up /etc/krb5.keytab"
print "Disabling client Kerberos and Ldap configurations"
print "Disabling client Kerberos and LDAP configurations"
try:
run(["/usr/sbin/authconfig", "--disableldap", "--disablekrb5", "--disablesssd", "--disablesssdauth", "--disablemkhomedir", "--update"])
except Exception, e:
print "Failed to remove krb5/ldap configuration. " +str(e)
print "Failed to remove krb5/LDAP configuration. " +str(e)
sys.exit(1)
print "Restoring client configuration files"
@ -572,7 +572,7 @@ def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options):
return 0
def resolve_ipaddress(server):
""" Connect to the server's ldap port in order to determine what ip
""" Connect to the server's LDAP port in order to determine what ip
address this machine uses as "public" ip (relative to the server).
"""
@ -685,8 +685,9 @@ def main():
if options.uninstall:
return uninstall(options, env)
if fstore.has_files() and not options.force:
sys.exit("IPA client is already configured on this system.")
if fstore.has_files():
sys.exit("IPA client is already configured on this system.\n"
+ "If you want to reinstall the IPA client please uninstall it first.")
cli_domain = None
cli_server = None