Fix foodcritic warnings

[chef.git] / cookbooks / taginfo / recipes / default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 35166f1d02c89e2900a3d3b416da863605d1e9e5..e1a9c722588901dfddb8ee73ce85708cd749ce39 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -19,7 +19,7 @@
 
 require "json"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 
@@ -45,7 +45,7 @@ ruby_version = node[:passenger][:ruby_version]
 
 package "ruby#{ruby_version}"
 
-%w(json sqlite3 sinatra sinatra-r18n rack-contrib).each do |gem|
+%w[json sqlite3 sinatra sinatra-r18n rack-contrib].each do |gem|
   gem_package gem do
     gem_binary "gem#{ruby_version}"
   end
@@ -102,7 +102,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/libosmium" do
     action :sync
     repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.10.3"
+    revision "v2.12.1"
     user "taginfo"
     group "taginfo"
   end
@@ -110,7 +110,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium-tool" do
     action :sync
     repository "git://github.com/osmcode/osmium-tool.git"
-    revision "v1.4.1"
+    revision "v1.6.1"
     user "taginfo"
     group "taginfo"
   end
@@ -168,7 +168,6 @@ node[:taginfo][:sites].each do |site|
     owner "taginfo"
     group "taginfo"
     mode "0755"
-    action :create
   end
 
   execute "compile-osmium" do
@@ -181,7 +180,7 @@ node[:taginfo][:sites].each do |site|
     subscribes :run, "git[#{directory}/osmium-tool]"
   end
 
-  %w(taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication).each do |dir|
+  %w[taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication].each do |dir|
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"
@@ -236,7 +235,6 @@ node[:taginfo][:sites].each do |site|
 
   ssl_certificate site_name do
     domains site_name
-    fallback_certificate "openstreetmap"
     notifies :reload, "service[apache2]"
   end