X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/efec66a495fa0b332d86aefc76af1311a011c4c2..0ef75fc789f0cfe4d602b9c79d5f50c1293088fc:/cookbooks/dev/templates/default/apache.user.erb
diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index 13afb27c2..258f120d3 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/<%= @user %>.sock|fcgi://127.0.0.1"
+
@@ -38,28 +39,11 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
ServerAdmin webmaster@openstreetmap.org
ServerAlias <%= @user %>.dev.osm.org
- # Remove Proxy request header to mitigate https://httpoxy.org/
- RequestHeader unset Proxy early
-
- UseCanonicalName Off
- DocumentRoot <%= @directory %>
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-
- RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-
- WSGIProcessGroup <%= @user %>.dev.openstreetmap.org
-
- RewriteEngine on
- #LogLevel rewrite:trace2
-
CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
- 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]
+ RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+ RedirectPermanent / https://<%= @user %>.dev.openstreetmap.org/
>