Merge pull request #11 from Unitt/feature/configure-keyserver

Make keyserver configurable and fix faraday (berkshelf version bump)
sunggun-yu · Nov 15, 2015 · 0505fc9 · 0505fc9
2 parents 6103359 + 4268033
commit 0505fc9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'berkshelf', '~> 3.2.4'
+gem 'berkshelf', '~> 4.0.1'
 gem 'test-kitchen', '~> 1.4.0'
 gem 'foodcritic', '4.0.0'
 

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -49,6 +49,9 @@
 # Key file contents
 default['mongodb3']['config']['key_file_content'] = nil
 
+# Key server
+default['mongodb3']['keyserver'] = 'hkp://keyserver.ubuntu.com:80'
+
 # Mongod config
 # The default value of the attribute is referred to the MongoDB documentation.
 # The attribute value of nil will be removed from mongod config file.

diff --git a/recipes/package_repo.rb b/recipes/package_repo.rb
@@ -33,7 +33,7 @@
       uri 'http://repo.mongodb.org/apt/ubuntu'
       distribution "#{node['lsb']['codename']}/mongodb-org/stable"
       components ['multiverse']
-      keyserver 'hkp://keyserver.ubuntu.com:80'
+      keyserver node['mongodb3']['keyserver']
       key '7F0CEB10'
       action :add
     end