mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
change OS X to macOS (#41294)
* change OS X to macOS <!--- Your description here --> +label: docsite_pr * Update all Mac OS X references to be macOS * Drop extra Mac
This commit is contained in:
@@ -22,7 +22,7 @@ from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNet
|
||||
|
||||
class DarwinNetwork(GenericBsdIfconfigNetwork):
|
||||
"""
|
||||
This is the Mac OS X/Darwin Network Class.
|
||||
This is the Mac macOS Darwin Network Class.
|
||||
It uses the GenericBsdIfconfigNetwork unchanged
|
||||
"""
|
||||
platform = 'Darwin'
|
||||
|
||||
@@ -109,7 +109,7 @@ class GenericBsdIfconfigNetwork(Network):
|
||||
all_ipv4_addresses=[],
|
||||
all_ipv6_addresses=[],
|
||||
)
|
||||
# FreeBSD, DragonflyBSD, NetBSD, OpenBSD and OS X all implicitly add '-a'
|
||||
# FreeBSD, DragonflyBSD, NetBSD, OpenBSD and macOS all implicitly add '-a'
|
||||
# when running the command 'ifconfig'.
|
||||
# Solaris must explicitly run the command 'ifconfig -a'.
|
||||
rc, out, err = self.module.run_command([ifconfig_path, ifconfig_options])
|
||||
|
||||
@@ -248,8 +248,8 @@ if not HAS_MATCH_HOSTNAME:
|
||||
HAS_MATCH_HOSTNAME = True
|
||||
|
||||
|
||||
# This is a dummy cacert provided for Mac OS since you need at least 1
|
||||
# ca cert, regardless of validity, for Python on Mac OS to use the
|
||||
# This is a dummy cacert provided for macOS since you need at least 1
|
||||
# ca cert, regardless of validity, for Python on macOS to use the
|
||||
# keychain functionality in OpenSSL for validating SSL certificates.
|
||||
# See: http://mercurial.selenic.com/wiki/CACertificates#Mac_OS_X_10.6_and_higher
|
||||
b_DUMMY_CA_CERT = b"""-----BEGIN CERTIFICATE-----
|
||||
@@ -625,7 +625,7 @@ class SSLValidationHandler(urllib_request.BaseHandler):
|
||||
to_add_fd, to_add_path = tempfile.mkstemp()
|
||||
to_add = False
|
||||
|
||||
# Write the dummy ca cert if we are running on Mac OS X
|
||||
# Write the dummy ca cert if we are running on macOS
|
||||
if system == u'Darwin':
|
||||
os.write(tmp_fd, b_DUMMY_CA_CERT)
|
||||
# Default Homebrew path for OpenSSL certs
|
||||
|
||||
Reference in New Issue
Block a user