Avoid duplicate resource names for wordpress plugins and themes

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index aee757e6e7a5cba8d05a8c654e2c61780a9cce82..957e46b47fb78e46b73d61469b49d648610101d7 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -47,7 +47,7 @@ action :create do
     mode 0o644
     content YAML.dump(:name => layer,
                       :title => title || layer,
     mode 0o644
     content YAML.dump(:name => layer,
                       :title => title || layer,

-                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :url => "//{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",

                       :attribution => copyright,
                       :default => default_layer,
                       :maxZoom => max_zoom,
                       :attribution => copyright,
                       :default => default_layer,
                       :maxZoom => max_zoom,


@@ -65,18 +65,23 @@ action :create do
 
   systemd_service "mapserv-fcgi-#{layer}" do
     description "Map server for #{layer} layer"
 
   systemd_service "mapserv-fcgi-#{layer}" do
     description "Map server for #{layer} layer"

-    limit_nofile 16384

     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
                 "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr"
     environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map",
                 "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
                 "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr"

+    limit_nofile 16384

     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket"

-    exec_start "/usr/bin/spawn-fcgi -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{layer}.pid -- /usr/bin/multiwatch -f 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
-    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"
-    type "forking"
+    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{layer}.pid -- /usr/bin/multiwatch -f 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
+    private_tmp true
+    private_devices true
+    private_network true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true

     restart "always"
     restart "always"

+    pid_file "/run/mapserver-fastcgi/layer-#{layer}.pid"

   end
 
   service "mapserv-fcgi-#{layer}" do
   end
 
   service "mapserv-fcgi-#{layer}" do