puppet/ldapquery
1
0
Fork 0
mirror of https://github.com/philippdieter/puppet-ldapquery.git synced 2025-10-13 04:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from tuenti/ca-file-optional

Browse Source 
Ca file optional
This commit is contained in:
Zach Leslie 2020-04-24 18:28:28 -07:00 committed by GitHub
commit 07507bd9fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -14,7 +14,7 @@ group :test do
gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
gem 'rspec-puppet-facts', '>= 1.9.5', :require => false gem 'rspec-puppet-facts', '>= 1.9.5', :require => false
gem 'rspec-puppet-utils', :require => false gem 'rspec-puppet-utils', :require => false
gem 'pdk', :require => false gem 'pdk', '>= 1.14.0', :require => false
gem 'puppet-module', :require => false gem 'puppet-module', :require => false
gem 'puppet-lint-leading_zero-check', :require => false gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false

11
lib/puppet_x/ldapquery.rb
View File

@ -52,8 +52,6 @@ module PuppetX
tls = Puppet[:ldaptls] tls = Puppet[:ldaptls]
ca_file = "#{Puppet[:confdir]}/ldap_ca.pem" ca_file = "#{Puppet[:confdir]}/ldap_ca.pem"
# TODO: if not exists ldap_ca.pem fail
conf = { conf = {
host: host, host: host,
port: port port: port
@ -69,9 +67,14 @@ module PuppetX
if tls if tls
conf[:encryption] = { conf[:encryption] = {
method: :simple_tls, method: :simple_tls
tls_options: { ca_file: ca_file }
} }
if File.file?(ca_file)
Puppet.debug("Using #{ca_file} as CA for TLS connection")
conf[:encryption][:tls_options] = { ca_file: ca_file }
else
Puppet.debug("#{ca_file} not found, using default CAs installed in your system")
end
end end
conf conf