Merge pull request #209 from ABrehm264/adding-ssl-validation-toggle

Adding skip_ssl_validation toggle to the datadog config file
DataDog · Oct 15, 2015 · 2016957 · 2016957
2 parents 4ab82e6 + 8c35c07
commit 2016957
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -133,6 +133,7 @@
 default['datadog']['web_proxy']['port'] = nil
 default['datadog']['web_proxy']['user'] = nil
 default['datadog']['web_proxy']['password'] = nil
+default['datadog']['web_proxy']['skip_ssl_validation'] = nil # accepted values 'yes' or 'no'
 
 # dogstatsd
 default['datadog']['dogstatsd'] = true

diff --git a/templates/default/datadog.conf.erb b/templates/default/datadog.conf.erb
@@ -11,6 +11,9 @@ bind_host: <%= node['datadog']['bind_host'] %>
 <% if node['datadog']['autorestart'] -%>
 autorestart: <%= node['datadog']['autorestart'] %>
 <% end -%>
+<% if node['datadog']['web_proxy']['skip_ssl_validation'] -%>
+skip_ssl_validation: <%= node['datadog']['web_proxy']['skip_ssl_validation'] %>
+<% end -%>
 
 tags: <%= node['datadog']['tags'] %>
 <% if node['datadog']['collect_ec2_tags'] -%>