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 b91fdc9c05b964e1fb6989897c9218d79fee99d0..7657504855a86855476ab00ec095d2ec8a3ac1a3 100644 (file)
--- a/cookbooks/dmca/recipes/default.rb
+++ b/cookbooks/dmca/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: dmca
+# Cookbook:: dmca

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2018, OpenStreetMap Foundation
+# Copyright:: 2018, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -18,23 +18,22 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

-
-apache_module "php7.2"
+include_recipe "php::fpm"

 
 directory "/srv/dmca.openstreetmap.org" do
   owner "root"
   group "root"
 
 directory "/srv/dmca.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 remote_directory "/srv/dmca.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"
 end
 
 remote_directory "/srv/dmca.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 ssl_certificate "dmca.openstreetmap.org" do
 end
 
 ssl_certificate "dmca.openstreetmap.org" do


@@ -42,6 +41,11 @@ ssl_certificate "dmca.openstreetmap.org" do
   notifies :reload, "service[apache2]"
 end
 
   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"
 apache_site "dmca.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dmca.openstreetmap.org"