imagery: switch to volume mount for imagery

[chef.git] / cookbooks / php / resources / fpm.rb

diff --git a/cookbooks/php/resources/fpm.rb b/cookbooks/php/resources/fpm.rb
index c461cf679c065b189df7ccb7ae330e7651e1e94f..13c973580e6fa4ca5e618eeef838df65141c5f5c 100644 (file)
--- a/cookbooks/php/resources/fpm.rb
+++ b/cookbooks/php/resources/fpm.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :pool, :kind_of => String, :name_property => true
 default_action :create
 
 property :pool, :kind_of => String, :name_property => true


@@ -24,12 +26,12 @@ property :port, :kind_of => Integer
 property :user, :kind_of => String, :default => "www-data"
 property :group, :kind_of => String, :default => "www-data"
 property :pm, :kind_of => String, :default => "dynamic"
 property :user, :kind_of => String, :default => "www-data"
 property :group, :kind_of => String, :default => "www-data"
 property :pm, :kind_of => String, :default => "dynamic"

-property :pm_max_children, :kind_of => Integer, :default => 5
-property :pm_start_servers, :kind_of => Integer, :default => 2
-property :pm_min_spare_servers, :kind_of => Integer, :default => 1
-property :pm_max_spare_servers, :kind_of => Integer, :default => 3
-property :pm_max_requests, :kind_of => Integer, :default => 500
-property :request_terminate_timeout, :kind_of => Integer, :default => 0
+property :pm_max_children, :kind_of => Integer, :default => 10
+property :pm_start_servers, :kind_of => Integer, :default => 4
+property :pm_min_spare_servers, :kind_of => Integer, :default => 2
+property :pm_max_spare_servers, :kind_of => Integer, :default => 6
+property :pm_max_requests, :kind_of => Integer, :default => 1000
+property :request_terminate_timeout, :kind_of => Integer, :default => 1800

 property :environment, :kind_of => Hash, :default => {}
 property :php_values, :kind_of => Hash, :default => {}
 property :php_admin_values, :kind_of => Hash, :default => {}
 property :environment, :kind_of => Hash, :default => {}
 property :php_values, :kind_of => Hash, :default => {}
 property :php_admin_values, :kind_of => Hash, :default => {}


@@ -45,15 +47,18 @@ action :create do
     owner "root"
     group "root"
     mode "644"
     owner "root"
     group "root"
     mode "644"

-    variables new_resource.to_hash
+    variables new_resource.to_hash.merge(:pool => new_resource.pool)

   end
 
   if new_resource.prometheus_port
     prometheus_exporter "phpfpm" do
       port new_resource.prometheus_port
   end
 
   if new_resource.prometheus_port
     prometheus_exporter "phpfpm" do
       port new_resource.prometheus_port

+      restrict_address_families "AF_UNIX"

       service service_name
       service service_name

+      group "www-data"

       command "server"
       command "server"

-      options "--phpfpm.scrape-uri=#{scrape_uri}"
+      options "--phpfpm.scrape-uri=#{scrape_uri} --phpfpm.fix-process-count"
+      labels "pool" => new_resource.pool

     end
   else
     prometheus_exporter "phpfpm" do
     end
   else
     prometheus_exporter "phpfpm" do


@@ -91,7 +96,7 @@ action_class do
     if new_resource.port
       "tcp://127.0.0.1:#{new_resource.port}/status"
     else
     if new_resource.port
       "tcp://127.0.0.1:#{new_resource.port}/status"
     else

-      "unix:///run/php/#{new_resource.pool}.sock;/status"
+      "unix:///run/php/php-#{new_resource.pool}-fpm.sock;/status"

     end
   end
 end
     end
   end
 end