From 9e3a3968e0a49920a232572d8d835b1e065b96ad Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jan 2018 18:21:31 +0000
Subject: [PATCH] Update phppgadmin site to use https

---
 cookbooks/dev/recipes/default.rb                |  5 +++++
 .../dev/templates/default/apache.phppgadmin.erb | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 35efa45f7..bdcec265a 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -111,6 +111,11 @@ file "/etc/apache2/conf.d/phppgadmin" do
   action :delete
 end
 
+ssl_certificate "phppgadmin.dev.openstreetmap.org" do
+  domains "phppgadmin.dev.openstreetmap.org"
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "phppgadmin.dev.openstreetmap.org" do
   template "apache.phppgadmin.erb"
 end
diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index 8f81e9d42..ec74a54da 100644
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -1,9 +1,13 @@
 # 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
 
@@ -17,6 +21,17 @@
 	ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin
 </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>
-- 
2.43.2