X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/757b7e227f73c7fcad7d9f61d24d58636d69f1d9..7896792df24c1042e7ac703629cbdec1d1edf4bf:/cookbooks/dev/templates/default/apache.phppgadmin.erb?ds=inline diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb index b6a7f9197..546a05cbe 100644 --- a/cookbooks/dev/templates/default/apache.phppgadmin.erb +++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb @@ -1,15 +1,37 @@ # DO NOT EDIT - This file is being maintained by Chef - + ServerName phppgadmin.dev.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined + SSLEngine on + SSLCertificateFile /etc/ssl/certs/phppgadmin.dev.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/phppgadmin.dev.openstreetmap.org.key + + CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log DocumentRoot /usr/share/phppgadmin - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin - ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin - ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin + # Remove Proxy request header to mitigate https://httpoxy.org/ + RequestHeader unset Proxy early + + ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/run/php/php-default-fpm.sock|fcgi://127.0.0.1 + ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/run/php/php-default-fpm.sock|fcgi://127.0.0.1 + ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/run/php/php-default-fpm.sock|fcgi://127.0.0.1 + + + + ServerName phppgadmin.dev.openstreetmap.org + ServerAdmin webmaster@openstreetmap.org + + CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended + ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log + + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + RedirectPermanent / https://phppgadmin.dev.openstreetmap.org/ + + + Require all granted +