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 657f3b51b285e9d6302219c28fff1c855d8b593c..13c973580e6fa4ca5e618eeef838df65141c5f5c 100644 (file)
--- a/cookbooks/php/resources/fpm.rb
+++ b/cookbooks/php/resources/fpm.rb
@@ -53,9 +53,12 @@ action :create do
   if new_resource.prometheus_port
     prometheus_exporter "phpfpm" do
       port new_resource.prometheus_port
   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


@@ -93,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