Skip to content

Commit

Permalink
Updating yumrepo_gpgkey based on feedback to GH-326
Browse files Browse the repository at this point in the history
  • Loading branch information
iancward committed Jul 15, 2016
1 parent b269c39 commit 6eb91d7
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,18 @@
architecture_map.default = 'x86_64'

# Older versions of yum embed M2Crypto with SSL that doesn't support TLS1.2
prefix = node['platform_version'].to_i < 6 ? 'http' : 'https'
yum_protocol =
if node['platform_family'] == 'rhel' && node['platform_version'].to_i < 6
'http'
else
'https'
end

default['datadog']['installrepo'] = true
default['datadog']['aptrepo'] = 'http://apt.datadoghq.com'
default['datadog']['aptrepo_dist'] = 'stable'
default['datadog']['yumrepo'] = "http://yum.datadoghq.com/rpm/#{architecture_map[node['kernel']['machine']]}/"
default['datadog']['yumrepo_gpgkey'] = "#{prefix}://yum.datadoghq.com/DATADOG_RPM_KEY.public"
default['datadog']['yumrepo_gpgkey'] = "#{yum_protocol}://yum.datadoghq.com/DATADOG_RPM_KEY.public"
default['datadog']['yumrepo_proxy'] = nil
default['datadog']['yumrepo_proxy_username'] = nil
default['datadog']['yumrepo_proxy_password'] = nil
Expand Down

0 comments on commit 6eb91d7

Please sign in to comment.