Run phpfpm exporter in group www-data to allow socket access

diff --git a/cookbooks/php/resources/fpm.rb b/cookbooks/php/resources/fpm.rb
index f8cc208b51d0cf69c3580f7dd497b1575f195da6..b63a0c814a2de01e85891fb33bd1019d6670d7a9 100644 (file)
--- a/cookbooks/php/resources/fpm.rb
+++ b/cookbooks/php/resources/fpm.rb
@@ -55,6 +55,7 @@ action :create do
       port new_resource.prometheus_port
       restrict_address_families "AF_UNIX"
       service service_name
       port new_resource.prometheus_port
       restrict_address_families "AF_UNIX"
       service service_name

+      group "www-data"

       command "server"
       options "--phpfpm.scrape-uri=#{scrape_uri}"
     end
       command "server"
       options "--phpfpm.scrape-uri=#{scrape_uri}"
     end

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index ac970426b03410e06885fdffdd7ebfd9ab5bd0d2..3087f9c93084eede68b1104ac035dd7632594862 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -27,6 +27,7 @@ property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"
 property :listen_type, :kind_of => String, :default => "address"
 property :user, :kind_of => String
 property :listen_switch, :kind_of => String, :default => "web.listen-address"
 property :listen_type, :kind_of => String, :default => "address"
 property :user, :kind_of => String

+property :group, :kind_of => String

 property :command, :kind_of => String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :command, :kind_of => String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}


@@ -50,6 +51,7 @@ action :create do
     type "simple"
     user new_resource.user
     dynamic_user new_resource.user.nil?
     type "simple"
     user new_resource.user
     dynamic_user new_resource.user.nil?

+    group new_resource.group

     environment new_resource.environment
     exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
     sandbox :enable_network => true
     environment new_resource.environment
     exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
     sandbox :enable_network => true