X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..50aea11082eaa90bd37593b9c987d38a082f4e1b:/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 2965946e2..546a05cbe 100644 --- a/cookbooks/dev/templates/default/apache.phppgadmin.erb +++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb @@ -8,7 +8,7 @@ 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 + 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 @@ -16,16 +16,16 @@ # Remove Proxy request header to mitigate https://httpoxy.org/ RequestHeader unset Proxy early - ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/run/php/default.sock|fcgi://127.0.0.1 - ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/run/php/default.sock|fcgi://127.0.0.1 - ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/run/php/default.sock|fcgi://127.0.0.1 + 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 + 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/