X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0f3cdcb49d8f3e8e1eedc01800aeeb51bfd34ff3..1952990836d6687ed4030bb95ca5f9e535eaf61f:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index f18896479..df4e76f43 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -93,17 +93,12 @@ 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"
   group "root"
   mode 0o750
-  variables :web_passwords => web_passwords
+  variables :totp_key => web_passwords["totp_key"]
 end
 
 template "/etc/cron.d/tilecache" do
@@ -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