X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/757b7e227f73c7fcad7d9f61d24d58636d69f1d9..9bb78787b17907354cc60ad73bd738560233c799:/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 b6a7f9197..fba255781 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
 
-<VirtualHost *:80>
+<VirtualHost *:443>
 	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
 
 	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
 </VirtualHost>
+
+<VirtualHost *:80>
+	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/
+</VirtualHost>
+
+<Directory /usr/share/phppgadmin>
+	Require all granted
+</Directory>