X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d4c21371069c4229dce7fc4316a1dea6d6e882e9..HEAD:/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 d308e5977..373d12258 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 @@ -23,14 +23,14 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit RewriteEngine on #LogLevel rewrite:trace2 - CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f RewriteRule ^/cgi-bin/(.*)$ /~<%= @user %>/cgi-bin/$1 [PT,L] - SetHandler "proxy:unix:/run/php/tomh.sock|fcgi://127.0.0.1" + SetHandler "proxy:unix:/run/php/php-<%= @user %>-fpm.sock|fcgi://127.0.0.1" @@ -39,7 +39,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit ServerAdmin webmaster@openstreetmap.org ServerAlias <%= @user %>.dev.osm.org - CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/