mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-07-25 00:44:46 +00:00
Compare commits
3 Commits
d9af430396
...
b42cbb2a97
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b42cbb2a97 | ||
|
|
aaacdb9d13 | ||
|
|
955acdca44 |
3
changelogs/fragments/643-sysctl-docs.yml
Normal file
3
changelogs/fragments/643-sysctl-docs.yml
Normal file
@@ -0,0 +1,3 @@
|
||||
---
|
||||
trivial:
|
||||
- sysctl - added the attributes section to the module documentation to reflect check_mode support (https://github.com/ansible-collections/ansible.posix/issues/643).
|
||||
3
changelogs/fragments/freebsd_sysctl.yml
Normal file
3
changelogs/fragments/freebsd_sysctl.yml
Normal file
@@ -0,0 +1,3 @@
|
||||
---
|
||||
bugfixes:
|
||||
- sysctl - reload sysctl only if the sysctl file is ``/etc/sysctl.conf`` or ``/etc/sysctl.conf.local`` (https://github.com/ansible-collections/ansible.posix/issues/663).
|
||||
@@ -121,10 +121,10 @@ EXAMPLES = r'''
|
||||
ansible.posix.authorized_key:
|
||||
user: deploy
|
||||
state: present
|
||||
key: '{{ item }}'
|
||||
with_file:
|
||||
- public_keys/doe-jane
|
||||
- public_keys/doe-john
|
||||
key: "{{ lookup('file', item) }}"
|
||||
loop:
|
||||
- public_keys/doe-jane
|
||||
- public_keys/doe-john
|
||||
|
||||
- name: Set authorized key defining key options
|
||||
ansible.posix.authorized_key:
|
||||
|
||||
@@ -44,6 +44,7 @@ options:
|
||||
- If V(true), performs a C(/sbin/sysctl -p) if the O(sysctl_file) is
|
||||
updated. If V(false), does not reload C(sysctl) even if the
|
||||
O(sysctl_file) is updated.
|
||||
- For FreeBSD, can not be used with O(sysctl_file) other than C(/etc/sysctl.conf) or C(/etc/sysctl.conf.local).
|
||||
type: bool
|
||||
default: true
|
||||
sysctl_file:
|
||||
@@ -56,6 +57,17 @@ options:
|
||||
- Verify token value with the sysctl command and set with C(-w) if necessary.
|
||||
type: bool
|
||||
default: false
|
||||
attributes:
|
||||
check_mode:
|
||||
support: full
|
||||
description: Can run in check_mode and return changed status prediction without modifying target.
|
||||
diff_mode:
|
||||
support: none
|
||||
description: Does not support differences output.
|
||||
platform:
|
||||
platforms: posix
|
||||
support: full
|
||||
description: Supported on POSIX-compliant systems.
|
||||
author:
|
||||
- David CHANIAL (@davixx)
|
||||
'''
|
||||
@@ -155,6 +167,11 @@ class SysctlModule(object):
|
||||
|
||||
self.platform = platform.system().lower()
|
||||
|
||||
# system specific tests
|
||||
freebsd_sysctl_files = ['/etc/sysctl.conf', '/etc/sysctl.conf.local']
|
||||
if self.platform == 'freebsd' and self.sysctl_file not in freebsd_sysctl_files and self.args['reload']:
|
||||
self.module.fail_json(msg="%s can not be reloaded. Set reload=False." % self.sysctl_file)
|
||||
|
||||
# Whitespace is bad
|
||||
self.args['name'] = self.args['name'].strip()
|
||||
self.args['value'] = self._parse_value(self.args['value'])
|
||||
|
||||
Reference in New Issue
Block a user