Merge remote-tracking branch 'github/pull/623'

diff --git a/cookbooks/planet/metadata.rb b/cookbooks/planet/metadata.rb
index 9d968cc78bbce868a9c0f0762c718e3745c16edd..a3e976976026aeb1b62048ef17bd359f0342e5e8 100644 (file)
--- a/cookbooks/planet/metadata.rb
+++ b/cookbooks/planet/metadata.rb
@@ -10,6 +10,7 @@ depends           "accounts"
 depends           "apache"
 depends           "apt"
 depends           "awscli"
+depends           "geoipupdate"
 depends           "git"
 depends           "munin"
 depends           "ruby"

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 412ec7cdb2e6a35ab0b1282578edf3415d041e60..fdeb9b8f55a61c8ad4896ede88b2ace549004ee9 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -19,6 +19,7 @@
 
 include_recipe "accounts"
 include_recipe "apache"
+include_recipe "geoipupdate"
 include_recipe "planet::aws"
 include_recipe "munin"