Skip to content

Commit 92e334e

Browse files
author
Johan De Wit
committed
add allowInvalidHostnames when found in config file
1 parent f159b0e commit 92e334e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

lib/facter/is_master.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@ def get_options_from_hash_config(config)
1616
# - sslMode is "requireSSL"
1717
# - Parameter --sslPEMKeyFile is set
1818
# - Parameter --sslCAFile is set
19-
result << "--ssl --host #{Facter.value(:fqdn)}" if config['net.ssl.mode'] == 'requireSSL' || !config['net.ssl.PEMKeyFile'].nil? || !config['net.ssl.CAFile'].nil?
19+
result << "--ssl --host #{Facter.value(:fqdn)}" if ['allowSSL', 'preferSSL', 'requireSSL'].include? config['net.ssl.mode'] || !config['net.ssl.PEMKeyFile'].nil? || !config['net.ssl.CAFile'].nil?
2020
result << "--sslPEMKeyFile #{config['net.ssl.PEMKeyFile']}" unless config['net.ssl.PEMKeyFile'].nil?
2121
result << "--sslCAFile #{config['net.ssl.CAFile']}" unless config['net.ssl.CAFile'].nil?
22+
result << "--sslAllowInvalidHostnames" if config['net.ssl.allowInvalidHostnames'] == true
2223
# use --tls and --host if:
2324
# - tlsMode is "requireTLS"
2425
# - Parameter --tlsCertificateKeyFile is set
2526
# - Parameter --tlsCAFile is set
26-
result << "--tls --host #{Facter.value(:fqdn)}" if config['net.tls.mode'] == 'requireTLS' || !config['net.tls.certificateKeyFile'].nil? || !config['net.tls.CAFile'].nil?
27+
result << "--tls --host #{Facter.value(:fqdn)}" if ['allowTLS', 'prefeTLS', 'requireTLS'].include? config['net.tls.mode'] || !config['net.tls.certificateKeyFile'].nil? || !config['net.tls.CAFile'].nil?
2728
result << "--tlsCertificateKeyFile #{config['net.tls.certificateKeyFile']}" unless config['net.tls.certificateKeyFile'].nil?
2829
result << "--tlsCAFile #{config['net.tls.CAFile']}" unless config['net.tls.CAFile'].nil?
30+
result << "--tlsAllowInvalidHostnames" if config['net.tls.allowInvalidHostnames'] == true
2931

3032
result << '--ipv6' unless config['net.ipv6'].nil?
3133

lib/puppet/provider/mongodb_user/mongodb.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def create
6767
roles: role_hashes(@resource[:roles], @resource[:database]),
6868
}
6969

70-
if mongo_4? || mongo_5?
70+
# is this still needed / we only support verion 4 and higher
71+
if mongo_4? || mongo_5? || mongo_6?
7172
if @resource[:auth_mechanism] == :scram_sha_256 # rubocop:disable Naming/VariableNumber
7273
command[:mechanisms] = ['SCRAM-SHA-256']
7374
command[:pwd] = @resource[:password]

0 commit comments

Comments
 (0)