From 5ae823acdfd3efcf3c73a57a7bbec91486bed3c0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 26 Jun 2018 15:13:50 +0100 Subject: [PATCH] Use PHP 7.2 on the dev server --- cookbooks/dev/recipes/default.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 8da923fe8..f467853fa 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -82,21 +82,21 @@ 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 +155,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 -- 2.43.2