X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/daa4be4ae5b1d24cf674b85499134b1ddb718545..HEAD:/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 8f81e9d42..546a05cbe 100644
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -1,10 +1,14 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<VirtualHost *:443>
 	ServerName phppgadmin.dev.openstreetmap.org
 	ServerAdmin webmaster@openstreetmap.org
 
-	CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined
+	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_extended
 	ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
 	DocumentRoot /usr/share/phppgadmin
@@ -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
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName phppgadmin.dev.openstreetmap.org
+	ServerAdmin webmaster@openstreetmap.org
+
+	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/
+	RedirectPermanent / https://phppgadmin.dev.openstreetmap.org/
 </VirtualHost>
 
 <Directory /usr/share/phppgadmin>