X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..66c8810de3626826ca758bf47b0def637254c97c:/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 e2d8556f7..8f81e9d42 100644
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -9,12 +9,14 @@
 
 	DocumentRoot /usr/share/phppgadmin
 
-	<IfModule mod_fastcgi_handler.c>
-		<FilesMatch "\.ph(p3?|tml)$">
-			SetHandler fcgi:/var/run/php5-fpm-default.sock
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler fcgi:/var/run/php5-fpm-default.sock
-		</FilesMatch>
-	</IfModule>
+	# 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
 </VirtualHost>
+
+<Directory /usr/share/phppgadmin>
+	Require all granted
+</Directory>