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 a9fe8d0267b904371f4520b9b45ad2a448aec3ee..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"
 
@@ -39,12 +39,13 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
+package "pbzip2"
 
 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
@@ -79,14 +80,14 @@ template "/etc/sudoers.d/taginfo" do
 end
 
 node[:taginfo][:sites].each do |site|
-  name = site[:name]
-  directory = site[:directory] || "/srv/#{name}"
+  site_name = site[:name]
+  directory = site[:directory] || "/srv/#{site_name}"
   description = site[:description]
   about = site[:about]
   icon = site[:icon]
   contact = site[:contact]
 
-  directory "/var/log/taginfo/#{name}" do
+  directory "/var/log/taginfo/#{site_name}" do
     owner "taginfo"
     group "taginfo"
     mode 0o755
@@ -101,7 +102,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/libosmium" do
     action :sync
     repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.8.0"
+    revision "v2.12.1"
     user "taginfo"
     group "taginfo"
   end
@@ -109,14 +110,14 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium-tool" do
     action :sync
     repository "git://github.com/osmcode/osmium-tool.git"
-    revision "v1.3.1"
+    revision "v1.6.1"
     user "taginfo"
     group "taginfo"
   end
 
   git "#{directory}/taginfo" do
     action :sync
-    repository "git://github.com/joto/taginfo.git"
+    repository "git://github.com/taginfo/taginfo.git"
     revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"
@@ -125,13 +126,13 @@ node[:taginfo][:sites].each do |site|
   settings = Chef::DelayedEvaluator.new do
     settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
 
-    settings["instance"]["url"] = "http://#{name}/"
+    settings["instance"]["url"] = "http://#{site_name}/"
     settings["instance"]["description"] = description
     settings["instance"]["about"] = about
     settings["instance"]["icon"] = "/img/logo/#{icon}.png"
     settings["instance"]["contact"] = contact
     settings["instance"]["access_control_allow_origin"] = ""
-    settings["logging"]["directory"] = "/var/log/taginfo/#{name}"
+    settings["logging"]["directory"] = "/var/log/taginfo/#{site_name}"
     settings["opensearch"]["shortname"] = "Taginfo"
     settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
     settings["sources"]["download"] = ""
@@ -140,7 +141,6 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
     settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
-    settings["level0"]["overpass_url_prefix"] = "http://overpass-api.de/api/interpreter?"
 
     JSON.pretty_generate(settings)
   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"
@@ -231,10 +230,15 @@ node[:taginfo][:sites].each do |site|
     owner "taginfo"
     group "taginfo"
     mode 0o755
-    variables :name => name, :directory => directory
+    variables :name => site_name, :directory => directory
   end
 
-  apache_site name do
+  ssl_certificate site_name do
+    domains site_name
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site site_name do
     template "apache.erb"
     directory "#{directory}/taginfo/web/public"
   end