minor doc fixes and reformating updated validate_certs feature to be 2.1

This commit is contained in:
Brian Coca 2015-11-27 09:28:50 -08:00 committed by Matt Clay
parent e86ba78685
commit b3c14ee0c3

View file

@ -81,14 +81,14 @@ options:
default: "no" default: "no"
version_added: "1.9" version_added: "1.9"
validate_certs: validate_certs:
description: description:
- If C(no), SSL certificates will not be validated. This should only - This only applies if using a https url as the source of the keys. If set to C(no), the SSL certificates will not be validated.
set to C(no) used on personally controlled sites using self-signed - This should only set to C(no) used on personally controlled sites using self-signed certificates as it avoids verifying the source site.
certificates. Prior to 2.0 the code defaulted to C(yes). - Prior to 2.1 the code worked as if this was set to C(yes).
required: false required: false
default: "yes" default: "yes"
choices: ["yes", "no"] choices: ["yes", "no"]
version_added: "2.0" version_added: "2.1"
description: description:
- "Adds or removes authorized keys for particular user accounts" - "Adds or removes authorized keys for particular user accounts"
author: "Ansible Core Team" author: "Ansible Core Team"
@ -102,32 +102,30 @@ EXAMPLES = '''
- authorized_key: user=charlie key=https://github.com/charlie.keys - authorized_key: user=charlie key=https://github.com/charlie.keys
# Using alternate directory locations: # Using alternate directory locations:
- authorized_key: user=charlie - authorized_key:
key="{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}" user: charlie
path='/etc/ssh/authorized_keys/charlie' key: "{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}"
manage_dir=no path: '/etc/ssh/authorized_keys/charlie'
manage_dir: no
# Using with_file # Using with_file
- name: Set up authorized_keys for the deploy user - name: Set up authorized_keys for the deploy user
authorized_key: user=deploy authorized_key: user=deploy key="{{ item }}"
key="{{ item }}"
with_file: with_file:
- public_keys/doe-jane - public_keys/doe-jane
- public_keys/doe-john - public_keys/doe-john
# Using key_options: # Using key_options:
- authorized_key: user=charlie - authorized_key:
key="{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}" user: charlie
key_options='no-port-forwarding,from="10.0.1.1"' key: "{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}"
key_options: 'no-port-forwarding,from="10.0.1.1"'
# Using validate_certs: # Using validate_certs:
- authorized_key: user=charlie - authorized_key: user=charlie key=https://github.com/user.keys validate_certs=no
key=https://github.com/user.keys
validate_certs=no
# Set up authorized_keys exclusively with one key # Set up authorized_keys exclusively with one key
- authorized_key: user=root key="{{ item }}" state=present - authorized_key: user=root key="{{ item }}" state=present exclusive=yes
exclusive=yes
with_file: with_file:
- public_keys/doe-jane - public_keys/doe-jane
''' '''