From f11aec497a1d6a2f360f0d5e9b6f60d726a09f9a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 12 Jul 2020 19:40:10 +0100 Subject: [PATCH] Allow PHP configuration options for FPM to be configured --- cookbooks/php/attributes/default.rb | 2 ++ cookbooks/php/recipes/fpm.rb | 7 +++++++ cookbooks/php/templates/default/php-fpm.ini.erb | 5 +++++ 3 files changed, 14 insertions(+) create mode 100644 cookbooks/php/templates/default/php-fpm.ini.erb diff --git a/cookbooks/php/attributes/default.rb b/cookbooks/php/attributes/default.rb index 0ca636813..ccce26093 100644 --- a/cookbooks/php/attributes/default.rb +++ b/cookbooks/php/attributes/default.rb @@ -3,3 +3,5 @@ default[:php][:version] = if node[:lsb][:release].to_f < 20.04 else "7.4" end + +default[:php][:fpm][:options] = {} diff --git a/cookbooks/php/recipes/fpm.rb b/cookbooks/php/recipes/fpm.rb index 9932bcdcf..be90a6783 100644 --- a/cookbooks/php/recipes/fpm.rb +++ b/cookbooks/php/recipes/fpm.rb @@ -22,6 +22,13 @@ include_recipe "php" package "php-fpm" +template "/etc/php/#{node[:php][:version]}/fpm/conf.d/99-chef.ini" do + source "php-fpm.ini.erb" + owner "root" + group "root" + mode 0o644 +end + service "php#{node[:php][:version]}-fpm" do action [:enable, :start] end diff --git a/cookbooks/php/templates/default/php-fpm.ini.erb b/cookbooks/php/templates/default/php-fpm.ini.erb new file mode 100644 index 000000000..da34ca3c6 --- /dev/null +++ b/cookbooks/php/templates/default/php-fpm.ini.erb @@ -0,0 +1,5 @@ +; DO NOT EDIT - This file is being maintained by Chef + +<% node[:php][:fpm][:options].sort.each do |key,value| -%> +<%= key %>=<%= value %> +<% end -%> -- 2.43.2