]> git.openstreetmap.org Git - chef.git/commitdiff
tilecache: fix config race
authorGrant Slater <git@firefishy.com>
Mon, 2 Jan 2017 21:30:55 +0000 (21:30 +0000)
committerGrant Slater <git@firefishy.com>
Mon, 2 Jan 2017 21:30:55 +0000 (21:30 +0000)
cookbooks/tilecache/recipes/default.rb

index 5ba99381d2a5edfa2674664c717b2103bad0a7c7..df4e76f43511f44f06d4f949ebc1401b78fbe099 100644 (file)
@@ -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