Disable tracking of loopback connections

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 7befcdc20980b77fde84a9e8a3a18cd4d3829a11..fe3b6c8622543aa1935dfd7fac75794fd2a16f9e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/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,
@@ -38,6 +38,11 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
+ssl_certificate node[:fqdn] do
+  domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
+  notifies :reload, "service[apache2]"
+end
+
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
@@ -353,9 +358,10 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
 
 package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]