Don't try and restart passenger on machines that don't have it

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 84151ae66e17a752a6eba0011c2943a21a0a1e28..9519b63bdaa304421e081b50ce2c34f83c0c9874 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,76 +21,83 @@ require "yaml"
 
 default_action :create
 
 
 default_action :create
 

-property :name, String
+property :site, String, :name_property => true

 property :title, String, :required => true
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => true
 
 action :create do
 property :title, String, :required => true
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => true
 
 action :create do

-  directory "/srv/#{name}" do
+  directory "/srv/#{new_resource.site}" do

     user "root"
     group "root"
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

   end
 
   end
 

-  directory "/srv/imagery/layers/#{name}" do
+  directory "/srv/imagery/layers/#{new_resource.site}" do

     user "root"
     group "root"
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
   end
 
     recursive true
   end
 

-  directory "/srv/imagery/overlays/#{name}" do
+  directory "/srv/imagery/overlays/#{new_resource.site}" do

     user "root"
     group "root"
     user "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
   end
 
     recursive true
   end
 

-  template "/srv/#{name}/index.html" do
+  declare_resource :template, "/srv/#{new_resource.site}/index.html" do

     source "index.html.erb"
     user "root"
     group "root"
     source "index.html.erb"
     user "root"
     group "root"

-    mode 0644
-    variables :title => title
+    mode 0o644
+    variables :title => new_resource.title

   end
 
   end
 

-  cookbook_file "/srv/#{name}/imagery.css" do
+  cookbook_file "/srv/#{new_resource.site}/imagery.css" do

     source "imagery.css"
     user "root"
     group "root"
     source "imagery.css"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 
   end
 

-  cookbook_file "/srv/#{name}/clientaccesspolicy.xml" do
+  cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do

     source "clientaccesspolicy.xml"
     user "root"
     group "root"
     source "clientaccesspolicy.xml"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 
   end
 

-  cookbook_file "/srv/#{name}/crossdomain.xml" do
+  cookbook_file "/srv/#{new_resource.site}/crossdomain.xml" do

     source "crossdomain.xml"
     user "root"
     group "root"
     source "crossdomain.xml"
     user "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 
   end
 

-  layers = Dir.glob("/srv/imagery/layers/#{name}/*.yml").collect do |path|
-    YAML.load(::File.read(path))
+  layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
+    YAML.safe_load(::File.read(path), [Symbol])

   end
 
   end
 

-  template "/srv/#{name}/imagery.js" do
+  declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do

     source "imagery.js.erb"
     user "root"
     group "root"
     source "imagery.js.erb"
     user "root"
     group "root"

-    mode 0644
-    variables :bbox => bbox, :layers => layers
+    mode 0o644
+    variables :bbox => new_resource.bbox, :layers => layers

   end
 
   end
 

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

     template "nginx_imagery.conf.erb"
     template "nginx_imagery.conf.erb"

-    directory "/srv/imagery/#{name}"
+    directory "/srv/imagery/#{new_resource.site}"

     restart_nginx false
     variables new_resource.to_hash
   end
     restart_nginx false
     variables new_resource.to_hash
   end