Use unix domain sockets for FPM on dev

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 30d26f9103baf2246a24e09e87e118ff002d9c92..1888e9cdde5f12035b5a005242e525cfd9b82ece 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -94,7 +94,6 @@ end
 package "apache2-suexec-pristine"
 
 php_fpm "default" do
-  port 7000
   pm_max_children 10
   pm_start_servers 4
   pm_min_spare_servers 2
@@ -159,10 +158,7 @@ search(:accounts, "*:*").each do |account|
 
   next unless File.directory?("#{user_home}/public_html")
 
-  port_number = 7000 + account["uid"].to_i
-
   php_fpm name do
-    port port_number
     user name
     group name
     pm_max_children 10
@@ -193,7 +189,7 @@ search(:accounts, "*:*").each do |account|
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"
-    variables :user => name, :port => port_number
+    variables :user => name
   end
 
   template "/etc/sudoers.d/#{name}" do