Use PHP 7.2 for mediawiki everywhere

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 0ec9dda590596a5230e5a01caf978e32c7428e9f..5c1cdba3c382df13993e58e70e704b7591a62192 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/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,
@@ -73,7 +73,7 @@ tilecaches.each do |cache|
 end
 
 squid_fragment "tilecache" do
-  template_source "squid.conf.erb"
+  template "squid.conf.erb"
   variables :caches => tilecaches, :renders => tilerenders
 end
 
@@ -88,10 +88,6 @@ nginx_site "default" do
   action [:delete]
 end
 
-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
-
 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
@@ -121,9 +117,9 @@ ssl_certificate "tile.openstreetmap.org" do
   notifies :restart, "service[nginx]"
 end
 
-nginx_site "tile-ssl" do
-  template_source "nginx_tile_ssl.conf.erb"
-  variables :resolvers => resolvers, :caches => tilecaches
+nginx_site "tile" do
+  template "nginx_tile.conf.erb"
+  variables :caches => tilecaches
 end
 
 template "/etc/logrotate.d/nginx" do