From: Grant Slater <git@firefishy.com>
Date: Mon, 2 Jan 2017 21:30:55 +0000 (+0000)
Subject: tilecache: fix config race
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c11a84f993c9c31b7fc9e54b57191ca6492d9fd8?hp=a5c9ec592d1d7f941ae2edb3d90ca06237261d8b

tilecache: fix config race
---

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 5ba99381d..df4e76f43 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -93,11 +93,6 @@ resolvers = node[:networking][:nameservers].map do |resolver|
   IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
 end
 
-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
-end
-
 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
@@ -119,6 +114,11 @@ execute "execute_nginx_generate_tilecache_qos_map" do
   action :run
 end
 
+nginx_site "tile-ssl" do
+  template "nginx_tile_ssl.conf.erb"
+  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
+end
+
 service "nginx-certificate-restart" do
   service_name "nginx"
   action :nothing