X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7dbac3592f79206cde96fe602cee8c54311d7ea5..08a2e7fb46cfb139567dc5a115dad99c23891dd1:/cookbooks/dev/templates/default/apache.user.erb?ds=sidebyside diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb index a6d4d8866..fb03b6487 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -1,6 +1,6 @@ # DO NOT EDIT - This file is being maintained by Chef -WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivity-timeout=600 +WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes=2 threads=8 restart-interval=3600 inactivity-timeout=600 graceful-timeout=60 maximum-requests=2000 ServerName <%= @user %>.dev.openstreetmap.org @@ -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 ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P] + + SetHandler "proxy:unix:/run/php/php-<%= @user %>-fpm.sock|fcgi://127.0.0.1" +