Use separate FPM pools for donate and dmca sites

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

diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb
index 625f702f1284d5387cdc89b88ec4ddd80b936515..7657504855a86855476ab00ec095d2ec8a3ac1a3 100644 (file)
--- a/cookbooks/dmca/recipes/default.rb
+++ b/cookbooks/dmca/recipes/default.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "apache"
-include_recipe "php::apache"
+include_recipe "php::fpm"
 
 directory "/srv/dmca.openstreetmap.org" do
   owner "root"
@@ -33,7 +33,7 @@ remote_directory "/srv/dmca.openstreetmap.org/html" do
   mode "755"
   files_owner "root"
   files_group "root"
-  files_mode 0o644
+  files_mode "644"
 end
 
 ssl_certificate "dmca.openstreetmap.org" do
@@ -41,6 +41,11 @@ ssl_certificate "dmca.openstreetmap.org" do
   notifies :reload, "service[apache2]"
 end
 
+php_fpm "dmca.openstreetmap.org" do
+  php_admin_values "open_basedir" => "/srv/dmca.openstreetmap.org/html/:/usr/share/php/:/tmp/",
+                   "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open"
+end
+
 apache_site "dmca.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dmca.openstreetmap.org"