X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d4c21371069c4229dce7fc4316a1dea6d6e882e9..5649ed2bd999281ca7c7475e481bb88d6debecf0:/cookbooks/dev/templates/default/apache.phppgadmin.erb

diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index 2965946e2..67c37df16 100644
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -2,13 +2,15 @@
 
 <VirtualHost *:443>
 	ServerName phppgadmin.dev.openstreetmap.org
+	ServerAlias phppgadmin.dev.osm.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
+	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 +18,18 @@
 	# 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
 </VirtualHost>
 
 <VirtualHost *:80>
 	ServerName phppgadmin.dev.openstreetmap.org
+	ServerAlias phppgadmin.dev.osm.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/