X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8dbaa3015b3375af96d772157adbd88659002b49..810efa014aa370e5f828d7fb9f33cb9e22de56e2:/cookbooks/imagery/resources/site.rb?ds=sidebyside diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index ea5884563..137153a72 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -30,20 +30,20 @@ action :create do directory "/srv/#{name}" do user "root" group "root" - mode 0755 + mode 0o755 end directory "/srv/imagery/layers/#{name}" do user "root" group "root" - mode 0755 + mode 0o755 recursive true end directory "/srv/imagery/overlays/#{name}" do user "root" group "root" - mode 0755 + mode 0o755 recursive true end @@ -51,7 +51,7 @@ action :create do source "index.html.erb" user "root" group "root" - mode 0644 + mode 0o644 variables :title => title end @@ -59,26 +59,50 @@ action :create do source "imagery.css" user "root" group "root" - mode 0644 + mode 0o644 + end + + cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do + source "clientaccesspolicy.xml" + user "root" + group "root" + mode 0o644 + end + + cookbook_file "/srv/#{name}/crossdomain.xml" do + source "crossdomain.xml" + user "root" + group "root" + mode 0o644 end layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path| - YAML.load(::File.read(path)) + YAML.safe_load(::File.read(path), [Symbol]) end template "/srv/#{name}/imagery.js" do source "imagery.js.erb" user "root" group "root" - mode 0644 + mode 0o644 variables :bbox => bbox, :layers => layers end - nginx_site name do + base_domains = [name] + Array(aliases) + + ssl_certificate new_resource.name do + domains base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] } + end + + resolvers = node[:networking][:nameservers].map do |resolver| + IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver + end + + nginx_site new_resource.name do template "nginx_imagery.conf.erb" directory "/srv/imagery/#{name}" restart_nginx false - variables new_resource.to_hash + variables new_resource.to_hash.merge(:resolvers => resolvers) end end