Convert planet references to use https

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index fd8b6cac9a5d4800f274f1d8a065cb35094ed321..1195df428e4c921b32ce6d91afcfbdd3d67819e1 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -19,32 +19,37 @@
 
 require "json"
 
 
 require "json"
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "passenger"
 include_recipe "git"
 
 include_recipe "passenger"
 include_recipe "git"
 

-package "libsqlite3-dev"
-package "zlib1g-dev"
-package "libbz2-dev"
-package "libboost-dev"
-package "libexpat1-dev"
-package "libsparsehash-dev"
-package "libgd2-xpm-dev"
-package "libicu-dev"
-package "libboost-program-options-dev"
-package "cmake"
-package "make"
-package "g++"
-
-package "sqlite3"
-package "osmosis"
-package "curl"
+package %w[
+  libsqlite3-dev
+  zlib1g-dev
+  libbz2-dev
+  libboost-dev
+  libexpat1-dev
+  libsparsehash-dev
+  libgd2-xpm-dev
+  libicu-dev
+  libboost-program-options-dev
+  cmake
+  make
+  g++
+]
+
+package %w[
+  sqlite3
+  osmosis
+  curl
+  pbzip2
+]

 
 ruby_version = node[:passenger][:ruby_version]
 
 package "ruby#{ruby_version}"
 
 
 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
   gem_package gem do
     gem_binary "gem#{ruby_version}"
   end


@@ -79,14 +84,14 @@ template "/etc/sudoers.d/taginfo" do
 end
 
 node[:taginfo][:sites].each do |site|
 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]
 
   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
     owner "taginfo"
     group "taginfo"
     mode 0o755


@@ -101,7 +106,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/libosmium" do
     action :sync
     repository "git://github.com/osmcode/libosmium.git"
   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
     user "taginfo"
     group "taginfo"
   end


@@ -109,14 +114,14 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium-tool" do
     action :sync
     repository "git://github.com/osmcode/osmium-tool.git"
   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
     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"
     revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"


@@ -125,13 +130,13 @@ node[:taginfo][:sites].each do |site|
   settings = Chef::DelayedEvaluator.new do
     settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
 
   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["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"] = ""
     settings["opensearch"]["shortname"] = "Taginfo"
     settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
     settings["sources"]["download"] = ""


@@ -167,7 +172,6 @@ node[:taginfo][:sites].each do |site|
     owner "taginfo"
     group "taginfo"
     mode "0755"
     owner "taginfo"
     group "taginfo"
     mode "0755"

-    action :create

   end
 
   execute "compile-osmium" do
   end
 
   execute "compile-osmium" do


@@ -180,7 +184,7 @@ node[:taginfo][:sites].each do |site|
     subscribes :run, "git[#{directory}/osmium-tool]"
   end
 
     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"
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"


@@ -190,7 +194,7 @@ node[:taginfo][:sites].each do |site|
 
   remote_file "#{directory}/planet/planet.pbf" do
     action :create_if_missing
 
   remote_file "#{directory}/planet/planet.pbf" do
     action :create_if_missing

-    source "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
+    source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"

     owner "taginfo"
     group "taginfo"
     mode 0o644
     owner "taginfo"
     group "taginfo"
     mode 0o644


@@ -230,10 +234,15 @@ node[:taginfo][:sites].each do |site|
     owner "taginfo"
     group "taginfo"
     mode 0o755
     owner "taginfo"
     group "taginfo"
     mode 0o755

-    variables :name => name, :directory => directory
+    variables :name => site_name, :directory => directory

   end
 
   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
     template "apache.erb"
     directory "#{directory}/taginfo/web/public"
   end