diff options
| author | David Kupka <dkupka@redhat.com> | 2014-08-27 16:02:35 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-09-26 13:38:57 +0200 |
| commit | 89c4f1242558d725a1771dce444df5737e49289e (patch) | |
| tree | c604f6bcc69feac08f8c511071496ab87e641ac5 /ipa-client/ipa-install | |
| parent | 66ce71f17a689bcad03022e3df6bbdf0fada2ab8 (diff) | |
| download | freeipa-89c4f1242558d725a1771dce444df5737e49289e.tar.gz freeipa-89c4f1242558d725a1771dce444df5737e49289e.tar.xz freeipa-89c4f1242558d725a1771dce444df5737e49289e.zip | |
Add 'host' setting into default.conf configuration file on client. Fix description in man page.
'host' setting specifies local hostname not the hostname of IPA server.
https://fedorahosted.org/freeipa/ticket/4481
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipa-client/ipa-install')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index b3da28df1..45e802207 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -812,7 +812,7 @@ def uninstall(options, env): return rv -def configure_ipa_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server): +def configure_ipa_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server, hostname): ipaconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer") ipaconf.setOptionAssignment(" = ") ipaconf.setSectionNameDelimiters(("[","]")) @@ -825,6 +825,7 @@ def configure_ipa_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server): {'name':'realm', 'type':'option', 'value':cli_realm}, {'name':'domain', 'type':'option', 'value':cli_domain}, {'name':'server', 'type':'option', 'value':cli_server[0]}, + {'name':'host', 'type':'option', 'value':hostname}, {'name':'xmlrpc_uri', 'type':'option', 'value':'https://%s/ipa/xml' % ipautil.format_netloc(cli_server[0])}, {'name':'enable_ra', 'type':'option', 'value':'True'}] @@ -2473,7 +2474,7 @@ def install(options, env, fstore, statestore): # Configure ipa.conf if not options.on_master: - configure_ipa_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server) + configure_ipa_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server, hostname) root_logger.info("Created /etc/ipa/default.conf") api.bootstrap(context='cli_installer', debug=options.debug) |