Move forum PHP configuration options to FPM configuration

diff --git a/cookbooks/forum/attributes/default.rb b/cookbooks/forum/attributes/default.rb
index 9f4114f8099ff0627294de623cbb41dfd54ff8ab..b4982d65c5fb4573d37adbbaa3afbe90c490101e 100644 (file)
--- 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
 # 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 e84f1e35b5e1e3b69873c4def075a1f1af20d0bf..9150356596f1620419c09665ed42a46800800115 100644 (file)
--- 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
        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

 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>


@@ -53,7 +48,3 @@
 
        Require all granted
 </Directory>
 
        Require all granted
 </Directory>

-
-<Directory /srv/forum.openstreetmap.org/html/img>
-       php_admin_flag engine off
-</Directory>