Make sure the planet user is created by recipes which use it

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index c26ac085d47e4b45e4e7badef06e9290efc35b4f..dc1fd51bb1189b5b5592d0f70b64253f93d8e96c 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -19,11 +19,13 @@
 
 require "yaml"
 
 
 require "yaml"
 

+unified_mode true
+

 default_action :create
 
 property :layer, String, :name_property => true
 property :site, String, :required => true
 default_action :create
 
 property :layer, String, :name_property => true
 property :site, String, :required => true

-property :source, String, :required => true
+property :source, String, :required => [:create]

 property :root_layer, [true, false], :default => false
 property :title, String
 property :copyright, String, :default => "Copyright"
 property :root_layer, [true, false], :default => false
 property :title, String
 property :copyright, String, :default => "Copyright"


@@ -44,7 +46,7 @@ action :create do
   file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do
     owner "root"
     group "root"
   file "/srv/imagery/layers/#{new_resource.site}/#{new_resource.layer}.yml" do
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     content YAML.dump(:name => new_resource.layer,
                       :title => new_resource.title || new_resource.layer,
                       :url => "//{s}.#{new_resource.site}/layer/#{new_resource.layer}/{z}/{x}/{y}.png",
     content YAML.dump(:name => new_resource.layer,
                       :title => new_resource.title || new_resource.layer,
                       :url => "//{s}.#{new_resource.site}/layer/#{new_resource.layer}/{z}/{x}/{y}.png",


@@ -59,24 +61,14 @@ action :create do
     source "mapserver.map.erb"
     owner "root"
     group "root"
     source "mapserver.map.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables new_resource.to_hash
   end
 
     variables new_resource.to_hash
   end
 

-  # Disable legacy service
-  service "mapserv-fcgi-#{new_resource.layer}" do
-    action [:stop, :disable]
-  end
-
-  # Remove legacy service
-  systemd_service "mapserv-fcgi-#{new_resource.layer}" do
-    action :delete
-  end
-

   directory "/srv/imagery/nginx/#{new_resource.site}" do
     owner "root"
     group "root"
   directory "/srv/imagery/nginx/#{new_resource.site}" do
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     recursive true
   end
 
     recursive true
   end
 


@@ -85,7 +77,7 @@ action :create do
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"
     source "nginx_imagery_layer_fragment.conf.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables new_resource.to_hash
   end
 end
     variables new_resource.to_hash
   end
 end


@@ -95,18 +87,10 @@ action :delete do
     action :delete
   end
 
     action :delete
   end
 

-  service "mapserv-fcgi-layer-#{new_resource.layer}" do
-    action [:stop, :disable]
-  end
-

   file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do
     action :delete
   end
 
   file "/srv/imagery/mapserver/layer-#{new_resource.layer}.map" do
     action :delete
   end
 

-  systemd_service "mapserv-fcgi-#{new_resource.layer}" do
-    action :delete
-  end
-

   file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do
     action :delete
   end
   file "/srv/imagery/nginx/#{new_resource.site}/layer-#{new_resource.layer}.conf" do
     action :delete
   end