Core backportapalooza 06 22 (#81111)

* Fix typo in comment filter option (#80672)

(cherry picked from commit 40fd86c618)

* Documentation tweaks for apt repo key management. Fixes #78063 (#80872)

(cherry picked from commit 0775e991d5)

* Update split.yml (#80915)

typo in description

(cherry picked from commit 6011b7c4c1)

* Correct syntax error in the example (#80976)

* Update success.yml
* Update reachable.yml
* Update unreachable.yml

(cherry picked from commit d210260afc)

* Update manager.py (#80926)

(cherry picked from commit e91bf2248f)

* Added link to argument_spec (#80967)

(cherry picked from commit 9e14a85fe3)

* modules/find: param contains: Describe matching behavior (#80744)

(cherry picked from commit a473bb798d)

* Update example in apt_key module (#81017)

* Verify checksum of downloaded key

Fixes: #79892

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit ce55e0faf5)

* Fix typo in to_yaml filter examples (#81094)

(cherry picked from commit 1f9836fe9a)

---------

Co-authored-by: Chris van Meer <chris@van-meer.net>
Co-authored-by: Matt Martz <matt@sivel.net>
Co-authored-by: F-Baker <35278989+F-Baker@users.noreply.github.com>
Co-authored-by: Vlad Glagolev <vaygr@users.noreply.github.com>
Co-authored-by: David-Ademola <131247654+David-Ademola@users.noreply.github.com>
Co-authored-by: tachyontec <92679798+tachyontec@users.noreply.github.com>
Co-authored-by: Felix Stupp <me+github/security-7XJy2od8@banananet.work>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
Co-authored-by: Giovanni Toraldo <me@gionn.net>
pull/81145/head
Sandra McCann 3 years ago committed by GitHub
parent 30f3fc2335
commit 0766ad33eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -63,7 +63,7 @@ def ensure_type(value, value_type, origin=None):
:temppath: Same as 'tmppath'
:tmp: Same as 'tmppath'
:pathlist: Treat the value as a typical PATH string. (On POSIX, this
means colon separated strings.) Split the value and then expand
means comma separated strings.) Split the value and then expand
each part for environment variables and tildes.
:pathspec: Treat the value as a PATH string. Expands any environment variables
tildes's in the value.

@ -27,7 +27,7 @@ attributes:
platform:
platforms: debian
notes:
- The apt-key command has been deprecated and suggests to 'manage keyring files in trusted.gpg.d instead'. See the Debian wiki for details.
- The apt-key command used by this module has been deprecated. See the L(Debian wiki,https://wiki.debian.org/DebianRepository/UseThirdParty) for details.
This module is kept for backwards compatibility for systems that still use apt-key as the main way to manage apt repository keys.
- As a sanity check, downloaded key id must match the one specified.
- "Use full fingerprint (40 characters) key ids to avoid key collisions.
@ -36,6 +36,8 @@ notes:
- Adding a new key requires an apt cache update (e.g. using the M(ansible.builtin.apt) module's update_cache option).
requirements:
- gpg
seealso:
- module: ansible.builtin.deb822_repository
options:
id:
description:
@ -81,12 +83,13 @@ options:
'''
EXAMPLES = '''
- name: One way to avoid apt_key once it is removed from your distro
- name: One way to avoid apt_key once it is removed from your distro, armored keys should use .asc extension, binary should use .gpg
block:
- name: somerepo |no apt key
- name: somerepo | no apt key
ansible.builtin.get_url:
url: https://download.example.com/linux/ubuntu/gpg
dest: /etc/apt/keyrings/somerepo.asc
url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x36a1d7869245c8950f966e92d8576a8ba88d21e9
dest: /etc/apt/keyrings/myrepo.asc
checksum: sha256:bb42f0db45d46bab5f9ec619e1a47360b94c27142e57aa71f7050d08672309e0
- name: somerepo | apt source
ansible.builtin.apt_repository:

@ -26,6 +26,8 @@ attributes:
platforms: debian
notes:
- This module supports Debian Squeeze (version 6) as well as its successors and derivatives.
seealso:
- module: ansible.builtin.deb822_repository
options:
repo:
description:

@ -56,6 +56,9 @@ options:
contains:
description:
- A regular expression or pattern which should be matched against the file content.
- If I(read_whole_file) is C(true) it matches against the beginning of the line (uses
C(re.match())). If I(read_whole_file) is C(false), it searches anywhere for that pattern
(uses C(re.search())).
- Works only when I(file_type) is C(file).
type: str
read_whole_file:

@ -17,7 +17,7 @@ version_added: "2.11"
options:
argument_spec:
description:
- A dictionary like AnsibleModule argument_spec
- A dictionary like AnsibleModule argument_spec. See R(argument spec definition,argument_spec)
required: true
provided_arguments:
description:

@ -38,7 +38,7 @@ DOCUMENTATION:
postfix:
description: Indicator of the end of each line inside a comment block, only available for styles that support multiline comments.
type: string
protfix_count:
postfix_count:
description: Number of times to add a postfix at the end of a line, when a prefix exists and is usable.
type: int
default: 1

@ -3,7 +3,7 @@ DOCUMENTATION:
version_added: "historical"
short_description: split a string into a list
description:
- Using Python's text object method C(split) we turn strings into lists via a 'spliting character'.
- Using Python's text object method C(split) we turn strings into lists via a 'splitting character'.
notes:
- This is a passthrough to Python's C(str.split).
positional: _input, _split_string

@ -44,7 +44,7 @@ EXAMPLES: |
{{ github_workflow |to_yaml}}
# same as above but 'prettier' (equivalent to to_nice_yaml filter)
{{ docker_config|to_json(indent=4) }}
{{ docker_config|to_yaml(indent=4) }}
RETURN:
_value:

@ -14,7 +14,7 @@ DOCUMENTATION:
required: True
EXAMPLES: |
# test 'status' to know how to respond
{{ (taskresults is changed }}
{{ taskresults is changed }}
RETURN:
_value:

@ -13,7 +13,7 @@ DOCUMENTATION:
required: True
EXAMPLES: |
# test 'status' to know how to respond
{{ (taskresults is reachable }}
{{ taskresults is reachable }}
RETURN:
_value:

@ -14,7 +14,7 @@ DOCUMENTATION:
required: True
EXAMPLES: |
# test 'status' to know how to respond
{{ (taskresults is success }}
{{ taskresults is success }}
RETURN:
_value:

@ -13,7 +13,7 @@ DOCUMENTATION:
required: True
EXAMPLES: |
# test 'status' to know how to respond
{{ (taskresults is unreachable }}
{{ taskresults is unreachable }}
RETURN:
_value:

Loading…
Cancel
Save