From 38b7c80217c4e72b1d8988eb1e60bb6e77334114 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 18 Apr 2024 07:52:22 +0200 Subject: Adding upstream version 9.4.0+dfsg. Signed-off-by: Daniel Baumann --- .../community/general/plugins/modules/timezone.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'ansible_collections/community/general/plugins/modules/timezone.py') diff --git a/ansible_collections/community/general/plugins/modules/timezone.py b/ansible_collections/community/general/plugins/modules/timezone.py index 05849e4bb..e027290e8 100644 --- a/ansible_collections/community/general/plugins/modules/timezone.py +++ b/ansible_collections/community/general/plugins/modules/timezone.py @@ -22,9 +22,6 @@ description: On AIX, C(chtz) is used. - Make sure that the zoneinfo files are installed with the appropriate OS package, like C(tzdata) (usually always installed, when not using a minimal installation like Alpine Linux). - - As of Ansible 2.3 support was added for SmartOS and BSDs. - - As of Ansible 2.4 support was added for macOS. - - As of Ansible 2.9 support was added for AIX 6.1+ - Windows and HPUX are not supported, please let us know if you find any other OS/distro in which this fails. extends_documentation_fragment: - community.general.attributes @@ -53,8 +50,9 @@ options: choices: [ local, UTC ] notes: - On SmartOS the C(sm-set-timezone) utility (part of the smtools package) is required to set the zone timezone - - On AIX only Olson/tz database timezones are useable (POSIX is not supported). - - An OS reboot is also required on AIX for the new timezone setting to take effect. + - On AIX only Olson/tz database timezones are usable (POSIX is not supported). + An OS reboot is also required on AIX for the new timezone setting to take effect. + Note that AIX 6.1+ is needed (OS level 61 or newer). author: - Shinichi TAMURA (@tmshn) - Jasper Lievisse Adriaanse (@jasperla) @@ -447,7 +445,7 @@ class NosystemdTimezone(Timezone): filename: The name of the file to edit. regexp: The regular expression to search with. value: The line which will be inserted. - key: For what key the file is being editted. + key: For what key the file is being edited. """ # Read the file try: @@ -725,7 +723,7 @@ class BSDTimezone(Timezone): localtime_file = '/etc/localtime' # Strategy 1: - # If /etc/localtime does not exist, assum the timezone is UTC. + # If /etc/localtime does not exist, assume the timezone is UTC. if not os.path.exists(localtime_file): self.module.warn('Could not read /etc/localtime. Assuming UTC.') return 'UTC' -- cgit v1.2.3