Remove forced downgrade of hp-health

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 84151ae66e17a752a6eba0011c2943a21a0a1e28..d6e2071ccfb1a07518a1ede888eaba2b78404663 100644 (file)
--- 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"
   directory "/srv/#{name}" do
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

   end
 
   directory "/srv/imagery/layers/#{name}" do
     user "root"
     group "root"
   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"
     recursive true
   end
 
   directory "/srv/imagery/overlays/#{name}" do
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
   end
 
     recursive true
   end
 


@@ -51,7 +51,7 @@ action :create do
     source "index.html.erb"
     user "root"
     group "root"
     source "index.html.erb"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :title => title
   end
 
     variables :title => title
   end
 


@@ -59,40 +59,51 @@ action :create do
     source "imagery.css"
     user "root"
     group "root"
     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"
   end
 
   cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
     source "clientaccesspolicy.xml"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 
   cookbook_file "/srv/#{name}/crossdomain.xml" do
     source "crossdomain.xml"
     user "root"
     group "root"
   end
 
   cookbook_file "/srv/#{name}/crossdomain.xml" do
     source "crossdomain.xml"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 
   layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
   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"
   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
 
     variables :bbox => bbox, :layers => layers
   end
 

-  nginx_site name do
+  base_domains = [name] + Array(aliases)
+  tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
+
+  ssl_certificate new_resource.name do
+    domains tile_domains
+  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
     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
 
   end
 end