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 c2f0e47c526eada6ddeda5d1e61d5deb3aa478e5..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
 #
-# 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,
@@ -27,83 +27,79 @@ property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => true
 
 action :create do
-  directory "/srv/#{site}" do
+  directory "/srv/#{new_resource.site}" do
     user "root"
     group "root"
     mode 0o755
   end
 
-  directory "/srv/imagery/layers/#{site}" do
+  directory "/srv/imagery/layers/#{new_resource.site}" do
     user "root"
     group "root"
     mode 0o755
     recursive true
   end
 
-  directory "/srv/imagery/overlays/#{site}" do
+  directory "/srv/imagery/overlays/#{new_resource.site}" do
     user "root"
     group "root"
     mode 0o755
     recursive true
   end
 
-  template "/srv/#{site}/index.html" do
+  declare_resource :template, "/srv/#{new_resource.site}/index.html" do
     source "index.html.erb"
     user "root"
     group "root"
     mode 0o644
-    variables :title => title
+    variables :title => new_resource.title
   end
 
-  cookbook_file "/srv/#{site}/imagery.css" do
+  cookbook_file "/srv/#{new_resource.site}/imagery.css" do
     source "imagery.css"
     user "root"
     group "root"
     mode 0o644
   end
 
-  cookbook_file "/srv/#{site}/clientaccesspolicy.xml" do
+  cookbook_file "/srv/#{new_resource.site}/clientaccesspolicy.xml" do
     source "clientaccesspolicy.xml"
     user "root"
     group "root"
     mode 0o644
   end
 
-  cookbook_file "/srv/#{site}/crossdomain.xml" do
+  cookbook_file "/srv/#{new_resource.site}/crossdomain.xml" do
     source "crossdomain.xml"
     user "root"
     group "root"
     mode 0o644
   end
 
-  layers = Dir.glob("/srv/imagery/layers/#{site}/*.yml").collect do |path|
+  layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
     YAML.safe_load(::File.read(path), [Symbol])
   end
 
-  template "/srv/#{site}/imagery.js" do
+  declare_resource :template, "/srv/#{new_resource.site}/imagery.js" do
     source "imagery.js.erb"
     user "root"
     group "root"
     mode 0o644
-    variables :bbox => bbox, :layers => layers
+    variables :bbox => new_resource.bbox, :layers => layers
   end
 
-  base_domains = [site] + Array(aliases)
+  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 site do
+  ssl_certificate new_resource.site do
     domains tile_domains
   end
 
-  resolvers = node[:networking][:nameservers].map do |resolver|
-    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-  end
-
-  nginx_site site do
+  nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
-    directory "/srv/imagery/#{site}"
+    directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false
-    variables new_resource.to_hash.merge(:resolvers => resolvers)
+    variables new_resource.to_hash
   end
 end