X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ad89576b72fc2a92c91c5b3a27a99dcfdf8c0fb3..ea65a185d043709670b7087fe3f6d58797fe48ee:/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 f6afd675d..a6d4d8866 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -2,11 +2,18 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivity-timeout=600 - + 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 + UseCanonicalName Off DocumentRoot <%= @directory %> ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ @@ -20,21 +27,36 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit 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] - - 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 + 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/ + + > AllowOverride AuthConfig FileInfo Indexes Options=RailsBaseURI Options SymLinksIfOwnerMatch Indexes Includes Require all granted +/cgi-bin> + SetHandler cgi-script + Options ExecCGI SymLinksIfOwnerMatch + Require all granted + + /wsgi-bin> SetHandler wsgi-script Options ExecCGI SymLinksIfOwnerMatch