From 821c5bdab849d9a59c208ad583a9671ab9d08a6f Mon Sep 17 00:00:00 2001 From: Dominic Salvador Date: Mon, 13 Mar 2017 14:38:25 -0500 Subject: [PATCH 1/4] Add custom gem server attribute to attributes/default.rb --- attributes/default.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/attributes/default.rb b/attributes/default.rb index d77baa6f..739bb17a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -268,3 +268,8 @@ # ddtrace ruby gem version default['datadog']['ddtrace_gem_version'] = nil + +# For custom gem servers on restricted networks +# This attribute only works on Chef >= 12.3 +# Change flase to the URL of your custom gem server +default{'datadog']['gem_server'] = false From 22d56770bada2373208ae08ffe6468bad325ddc8 Mon Sep 17 00:00:00 2001 From: Dominic Salvador Date: Mon, 13 Mar 2017 14:40:47 -0500 Subject: [PATCH 2/4] If attribute is set, then use custom gem server. --- recipes/dd-handler.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/dd-handler.rb b/recipes/dd-handler.rb index f3e7b907..05d86f8d 100644 --- a/recipes/dd-handler.rb +++ b/recipes/dd-handler.rb @@ -34,6 +34,8 @@ version node['datadog']['chef_handler_version'] # Chef 12 introduced `compile_time` - remove when Chef 11 is EOL. compile_time true if respond_to?(:compile_time) + clear_sources true if node['datadog']['gem_server'] + source node['datadog']['gem_server'] if node['datadog']['gem_server'] end require 'chef/handler/datadog' From 607e9a2bebde833d13e9da9c27905d0fdb6dd9d7 Mon Sep 17 00:00:00 2001 From: Dominic Salvador Date: Mon, 13 Mar 2017 14:51:27 -0500 Subject: [PATCH 3/4] Fix typo. --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 739bb17a..9233127c 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -272,4 +272,4 @@ # For custom gem servers on restricted networks # This attribute only works on Chef >= 12.3 # Change flase to the URL of your custom gem server -default{'datadog']['gem_server'] = false +default['datadog']['gem_server'] = false From 83e9be8c64eee58f725e2ed825530be6a685e4f8 Mon Sep 17 00:00:00 2001 From: Dominic Salvador Date: Mon, 13 Mar 2017 15:53:58 -0500 Subject: [PATCH 4/4] Another typo. --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 9233127c..7bab4db9 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -271,5 +271,5 @@ # For custom gem servers on restricted networks # This attribute only works on Chef >= 12.3 -# Change flase to the URL of your custom gem server +# Change false to the URL of your custom gem server default['datadog']['gem_server'] = false