Don't disable loopback connection tracking on 14.04

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 494a0ad0fca02e63d590d1ac48549415ac1a6364..c93176e2587c1a68b4644099806dc607f81bc037 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-mcrypt
   php-mysql
   php-pear
   php-pgsql
@@ -76,27 +75,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 +148,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 +223,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
 
@@ -249,7 +243,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
       apache_site site_name do
         template "apache.rails.erb"
-        variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
+        variables :application_name => name, :aliases => site_aliases, :secret_key_base => secret_key_base
       end
     else
       apache_site site_name do