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

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 50528eae7feeccdc2443c5e360d9ddc170c47b3a..98a45e378958ea963f46d7af18a4e2a5ddc3e59f 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,7 +30,7 @@ package %w[
   libboost-dev
   libexpat1-dev
   libsparsehash-dev
-  libgd2-xpm-dev
+  libgd-dev
   libicu-dev
   libboost-program-options-dev
   cmake
@@ -85,6 +85,7 @@ end
 
 node[:taginfo][:sites].each do |site|
   site_name = site[:name]
+  site_aliases = Array(site[:aliases])
   directory = site[:directory] || "/srv/#{site_name}"
   description = site[:description]
   about = site[:about]
@@ -130,7 +131,7 @@ 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://#{site_name}/"
+    settings["instance"]["url"] = "https://#{site_name}/"
     settings["instance"]["description"] = description
     settings["instance"]["about"] = about
     settings["instance"]["icon"] = "/img/logo/#{icon}.png"
@@ -194,7 +195,7 @@ node[:taginfo][:sites].each do |site|
 
   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
@@ -238,12 +239,13 @@ node[:taginfo][:sites].each do |site|
   end
 
   ssl_certificate site_name do
-    domains site_name
+    domains [site_name] + site_aliases
     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory "#{directory}/taginfo/web/public"
+    variables :aliases => site_aliases
   end
 end