Skip to content

Commit a4d6a65

Browse files
fix(is_master-fact): use --ssl if --sslPEMKeyFile or --sslCAFile is specified
1 parent b009b63 commit a4d6a65

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

lib/facter/is_master.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ def get_options_from_hash_config(config)
1010
result = []
1111

1212
result << "--port #{config['net.port']}" unless config['net.port'].nil?
13-
result << "--ssl --host #{Facter.value(:fqdn)}" if config['net.ssl.mode'] == 'requireSSL'
13+
# use --ssl and --host if:
14+
# - sslMode is "requireSSL"
15+
# - Parameter --sslPEMKeyFile is set
16+
# - Parameter --sslCAFile is set
17+
result << "--ssl --host #{Facter.value(:fqdn)}" if config['net.ssl.mode'] == 'requireSSL' || !config['net.ssl.PEMKeyFile'].nil? || !config['net.ssl.CAFile'].nil?
1418
result << "--sslPEMKeyFile #{config['net.ssl.PEMKeyFile']}" unless config['net.ssl.PEMKeyFile'].nil?
1519
result << "--sslCAFile #{config['net.ssl.CAFile']}" unless config['net.ssl.CAFile'].nil?
1620
result << '--ipv6' unless config['net.ipv6'].nil?
@@ -28,7 +32,11 @@ def get_options_from_keyvalue_config(file)
2832
result = []
2933

3034
result << "--port #{config['port']}" unless config['port'].nil?
31-
result << "--ssl --host #{Facter.value(:fqdn)}" if config['ssl'] == 'requireSSL'
35+
# use --ssl and --host if:
36+
# - sslMode is "requireSSL"
37+
# - Parameter --sslPEMKeyFile is set
38+
# - Parameter --sslCAFile is set
39+
result << "--ssl --host #{Facter.value(:fqdn)}" if config['ssl'] == 'requireSSL' || !config['sslcert'].nil? || !config['sslca'].nil?
3240
result << "--sslPEMKeyFile #{config['sslcert']}" unless config['sslcert'].nil?
3341
result << "--sslCAFile #{config['sslca']}" unless config['sslca'].nil?
3442
result << '--ipv6' unless config['ipv6'].nil?

0 commit comments

Comments
 (0)