From b0b2743589c084b4fbc6260b05126690348441e5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 12 Jul 2020 19:45:54 +0100 Subject: [PATCH] Move forum PHP configuration options to FPM configuration --- cookbooks/forum/attributes/default.rb | 6 ++++++ cookbooks/forum/templates/default/apache.erb | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cookbooks/forum/attributes/default.rb b/cookbooks/forum/attributes/default.rb index 9f4114f80..b4982d65c 100644 --- a/cookbooks/forum/attributes/default.rb +++ b/cookbooks/forum/attributes/default.rb @@ -1,2 +1,8 @@ # Enable the "forum" role default[:accounts][:users][:forum][:status] = :role + +# Configure PHP options +default[:php][:fpm][:options][:open_basedir] = "/srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/" +default[:php][:fpm][:options][:disable_functions] = "exec,shell_exec,system,passthru,popen,proc_open" +default[:php][:fpm][:options][:upload_max_filesize] = "70M" +default[:php][:fpm][:options][:post_max_size] = "100M" diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb index e84f1e35b..915035659 100644 --- a/cookbooks/forum/templates/default/apache.erb +++ b/cookbooks/forum/templates/default/apache.erb @@ -38,11 +38,6 @@ ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log DocumentRoot /srv/forum.openstreetmap.org/html - - php_admin_value open_basedir /srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/ - php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open" - php_value upload_max_filesize 70M - php_value post_max_size 100M @@ -53,7 +48,3 @@ Require all granted - - - php_admin_flag engine off - -- 2.39.5