Use PHP 7.2 for mediawiki everywhere

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 494a0ad0fca02e63d590d1ac48549415ac1a6364..46ba9bdd3626b78282442fce84b4cab1de267035 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -37,7 +37,6 @@ package %w[
   php-db
   php-fpm
   php-imagick
   php-db
   php-fpm
   php-imagick

-  php-mcrypt

   php-mysql
   php-pear
   php-pgsql
   php-mysql
   php-pear
   php-pgsql


@@ -76,27 +75,21 @@ apache_module "wsgi"
 
 package "apache2-suexec-pristine"
 
 
 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
 
   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
   source "fpm-default.conf.erb"
   owner "root"
   group "root"
   mode 0o644

-  notifies :reload, "service[php7.0-fpm]"
+  notifies :reload, "service[php7.2-fpm]"

 end
 
 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
   action :delete

-  notifies :reload, "service[php7.0-fpm]"
+  notifies :reload, "service[php7.2-fpm]"

 end
 
 directory "/srv/dev.openstreetmap.org" do
 end
 
 directory "/srv/dev.openstreetmap.org" do


@@ -155,13 +148,13 @@ search(:accounts, "*:*").each do |account|
 
   port = 7000 + account["uid"].to_i
 
 
   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
     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
   end
 
   ssl_certificate "#{name}.dev.openstreetmap.org" do


@@ -230,6 +223,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
         database_name database_name
         database_username "apis"
         memcache_servers ["127.0.0.1"]
         database_name database_name
         database_username "apis"
         memcache_servers ["127.0.0.1"]

+        csp_enforce true

         run_migrations true
       end
 
         run_migrations true
       end