X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/169f0cfcb0a3b2a41caa94cf65144be1ae693020..80388d9a4e108a60b3434ccdf308699804d22fb1:/cookbooks/web/resources/rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 4d30aa7cc..1c95dd8dc 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.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,
@@ -65,6 +65,7 @@ property :mapquest_key, String
 property :mapzen_valhalla_key, String
 property :thunderforest_key, String
 property :totp_key, String
+property :csp_enforce, [TrueClass, FalseClass], :default => false
 property :csp_report_url, String
 property :piwik_configuration, Hash
 
@@ -85,6 +86,18 @@ action :create do
     libxml2-dev
     libxslt1-dev
     libmemcached-dev
+    libffi-dev
+  ]
+
+  package %w[
+    pngcrush
+    advancecomp
+    optipng
+    pngquant
+    jhead
+    jpegoptim
+    gifsicle
+    libjpeg-turbo-progs
   ]
 
   gem_package "bundler#{new_resource.ruby}" do
@@ -252,6 +265,10 @@ action :create do
       line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{new_resource.totp_key}\"")
     end
 
+    if new_resource.csp_enforce
+      line.gsub!(/^( *)csp_enforce:.*$/, "\\1csp_enforce: \"#{new_resource.csp_enforce}\"")
+    end
+
     if new_resource.csp_report_url
       line.gsub!(/^( *)#csp_report_url:.*$/, "\\1csp_report_url: \"#{new_resource.csp_report_url}\"")
     end