X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/609a84ff97509e44637ceb230d2ac90748ae5143..d0df16b1ad827a1bf5be089798db8ceadb737196:/cookbooks/dev/templates/default/apache.phppgadmin.erb?ds=sidebyside diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb index 8f81e9d42..fba255781 100644 --- a/cookbooks/dev/templates/default/apache.phppgadmin.erb +++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb @@ -1,9 +1,13 @@ # DO NOT EDIT - This file is being maintained by Chef - + ServerName phppgadmin.dev.openstreetmap.org ServerAdmin webmaster@openstreetmap.org + 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 ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log @@ -12,9 +16,20 @@ # Remove Proxy request header to mitigate https://httpoxy.org/ RequestHeader unset Proxy early - 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 + 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 + 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/