diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2012-09-12 09:19:26 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-09-13 13:13:48 +0200 |
| commit | f6fed3c54742bbfcc4d8bb6433c5965ca61fd989 (patch) | |
| tree | b3da9f8d4e801e3122a03a8c449fbc7f136162d0 /install | |
| parent | 8728d3145f4c2f7bd1fed8c75f33f9ed7df555d2 (diff) | |
| download | freeipa-f6fed3c54742bbfcc4d8bb6433c5965ca61fd989.tar.gz freeipa-f6fed3c54742bbfcc4d8bb6433c5965ca61fd989.tar.xz freeipa-f6fed3c54742bbfcc4d8bb6433c5965ca61fd989.zip | |
Add --no-ssh option to ipa-client-install to disable OpenSSH client configuration.
If both --no-ssh and --no-sshd are specified, do not configure the SSH service
in SSSD.
ticket 3070
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-replica-install | 4 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 4 | ||||
| -rw-r--r-- | install/tools/man/ipa-replica-install.1 | 3 | ||||
| -rw-r--r-- | install/tools/man/ipa-server-install.1 | 3 |
4 files changed, 14 insertions, 0 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 41e1ef575..267a70d8b 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -68,6 +68,8 @@ def parse_options(): default=True, help="Do not automatically redirect to the Web UI") basic_group.add_option("--ssh-trust-dns", dest="trust_sshfp", default=False, action="store_true", help="configure OpenSSH client to trust DNS SSHFP records") + basic_group.add_option("--no-ssh", dest="conf_ssh", default=True, action="store_false", + help="do not configure OpenSSH client") basic_group.add_option("--no-sshd", dest="conf_sshd", default=True, action="store_false", help="do not configure OpenSSH server") basic_group.add_option("--skip-conncheck", dest="skip_conncheck", action="store_true", @@ -500,6 +502,8 @@ def main(): args.append("--no-dns-sshfp") if options.trust_sshfp: args.append("--ssh-trust-dns") + if not options.conf_ssh: + args.append("--no-ssh") if not options.conf_sshd: args.append("--no-sshd") ipautil.run(args) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index ba056fde2..f07aeadf8 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -145,6 +145,8 @@ def parse_options(): default=True, help="Do not automatically redirect to the Web UI") basic_group.add_option("--ssh-trust-dns", dest="trust_sshfp", default=False, action="store_true", help="configure OpenSSH client to trust DNS SSHFP records") + basic_group.add_option("--no-ssh", dest="conf_ssh", default=True, action="store_false", + help="do not configure OpenSSH client") basic_group.add_option("--no-sshd", dest="conf_sshd", default=True, action="store_false", help="do not configure OpenSSH server") basic_group.add_option("-d", "--debug", dest="debug", action="store_true", @@ -1071,6 +1073,8 @@ def main(): args.append("--no-dns-sshfp") if options.trust_sshfp: args.append("--ssh-trust-dns") + if not options.conf_ssh: + args.append("--no-ssh") if not options.conf_sshd: args.append("--no-sshd") run(args) diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1 index 3f4459727..084b45436 100644 --- a/install/tools/man/ipa-replica-install.1 +++ b/install/tools/man/ipa-replica-install.1 @@ -56,6 +56,9 @@ Do not automatically redirect to the Web UI. \fB\-\-ssh\-trust\-dns\fR Configure OpenSSH client to trust DNS SSHFP records. .TP +\fB\-\-no\-ssh\fR +Do not configure OpenSSH client. +.TP \fB\-\-no\-sshd\fR Do not configure OpenSSH server. .TP diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1 index 61b7c669c..75c6a78ac 100644 --- a/install/tools/man/ipa-server-install.1 +++ b/install/tools/man/ipa-server-install.1 @@ -66,6 +66,9 @@ Do not automatically redirect to the Web UI. \fB\-\-ssh\-trust\-dns\fR Configure OpenSSH client to trust DNS SSHFP records. .TP +\fB\-\-no\-ssh\fR +Do not configure OpenSSH client. +.TP \fB\-\-no\-sshd\fR Do not configure OpenSSH server. .TP |