X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/13d93b0c9ef6c839d0ee550ded6e845a4a827fc9..5e01e28d3970940f3be03d7bfa514373175caad8:/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 37ba4e460..373d12258 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -1,12 +1,16 @@ # 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 ServerAdmin webmaster@openstreetmap.org ServerAlias <%= @user %>.dev.osm.org + SSLEngine on + SSLCertificateFile /etc/ssl/certs/<%= @user %>.dev.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/<%= @user %>.dev.openstreetmap.org.key + # Remove Proxy request header to mitigate https://httpoxy.org/ RequestHeader unset Proxy early @@ -19,17 +23,27 @@ 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/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L] + RewriteRule ^/cgi-bin/(.*)$ /~<%= @user %>/cgi-bin/$1 [PT,L] - RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f - RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L] + + SetHandler "proxy:unix:/run/php/php-<%= @user %>-fpm.sock|fcgi://127.0.0.1" + + - RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f - RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P] + + ServerName <%= @user %>.dev.openstreetmap.org + ServerAdmin webmaster@openstreetmap.org + ServerAlias <%= @user %>.dev.osm.org + + 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/ + RedirectPermanent / https://<%= @user %>.dev.openstreetmap.org/ > @@ -38,6 +52,12 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit Require all granted +/cgi-bin> + SetHandler cgi-script + Options ExecCGI SymLinksIfOwnerMatch + Require all granted + + /wsgi-bin> SetHandler wsgi-script Options ExecCGI SymLinksIfOwnerMatch