X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/acaa192f0952528cf347dad8668b9ebdbdfe9f4c..c29f6f4ec43659a62418e3f6ec7b77e56e7fedc7:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 494a0ad0f..a5ceee940 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -76,27 +76,21 @@ apache_module "wsgi"
 
 package "apache2-suexec-pristine"
 
-gem_package "sqlite3"
-
-gem_package "rails" do
-  version "3.0.9"
-end
-
-service "php7.0-fpm" do
+service "php7.2-fpm" do
   action [:enable, :start]
 end
 
-template "/etc/php/7.0/fpm/pool.d/default.conf" do
+template "/etc/php/7.2/fpm/pool.d/default.conf" do
   source "fpm-default.conf.erb"
   owner "root"
   group "root"
   mode 0o644
-  notifies :reload, "service[php7.0-fpm]"
+  notifies :reload, "service[php7.2-fpm]"
 end
 
-file "/etc/php/7.0/fpm/pool.d/www.conf" do
+file "/etc/php/7.2/fpm/pool.d/www.conf" do
   action :delete
-  notifies :reload, "service[php7.0-fpm]"
+  notifies :reload, "service[php7.2-fpm]"
 end
 
 directory "/srv/dev.openstreetmap.org" do
@@ -155,13 +149,13 @@ search(:accounts, "*:*").each do |account|
 
   port = 7000 + account["uid"].to_i
 
-  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.2/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables :user => name, :port => port
-    notifies :reload, "service[php7.0-fpm]"
+    notifies :reload, "service[php7.2-fpm]"
   end
 
   ssl_certificate "#{name}.dev.openstreetmap.org" do
@@ -230,6 +224,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
         database_name database_name
         database_username "apis"
         memcache_servers ["127.0.0.1"]
+        csp_enforce true
         run_migrations true
       end