Use unix domain sockets for FPM on dev

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
 package "apache2-suexec-pristine"
 
 php_fpm "default" do

-  port 7000

   pm_max_children 10
   pm_start_servers 4
   pm_min_spare_servers 2
   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")
 
 
   next unless File.directory?("#{user_home}/public_html")
 

-  port_number = 7000 + account["uid"].to_i
-

   php_fpm name do
   php_fpm name do

-    port port_number

     user name
     group name
     pm_max_children 10
     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"
   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
   end
 
   template "/etc/sudoers.d/#{name}" do

diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index ec74a54da0638f99f47468e88f2822b858e2c4c8..2965946e2ad92e8ce5d2cf7b865ae39b3fb1090d 100644 (file)
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -16,9 +16,9 @@
        # Remove Proxy request header to mitigate https://httpoxy.org/
        RequestHeader unset Proxy early
 
        # Remove Proxy request header to mitigate https://httpoxy.org/
        RequestHeader unset Proxy early
 

-       ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin
-       ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin
-       ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin
+       ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/run/php/default.sock|fcgi://127.0.0.1
+       ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/run/php/default.sock|fcgi://127.0.0.1
+       ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/run/php/default.sock|fcgi://127.0.0.1

 </VirtualHost>
 
 <VirtualHost *:80>
 </VirtualHost>
 
 <VirtualHost *:80>

diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index a6d4d8866402de0405897b2048174113ab6a783a..d308e59778dd9d45d90722c28629a12063cdd9b6 100644 (file)
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -29,8 +29,9 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
        RewriteRule ^/cgi-bin/(.*)$ /~<%= @user %>/cgi-bin/$1 [PT,L]
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
        RewriteRule ^/cgi-bin/(.*)$ /~<%= @user %>/cgi-bin/$1 [PT,L]
 

-       RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
-       RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]
+       <FilesMatch ".+\.ph(p|ps|p3|tml)$">
+               SetHandler "proxy:unix:/run/php/tomh.sock|fcgi://127.0.0.1"
+       </FilesMatch>

 </VirtualHost>
 
 <VirtualHost *:80>
 </VirtualHost>
 
 <VirtualHost *:80>