From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 May 2018 18:08:38 +0000 (+0100)
Subject: Drop http support on web backends
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3e098484e0efc4c115e16a60bee467d2721ec970

Drop http support on web backends
---

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 8a8bb3fa1..c024090b2 100644
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -1,14 +1,12 @@
 # DO NOT EDIT - This file is being maintained by Chef
-<% [80, 443].each do |port| -%>
 
-<VirtualHost *:<%= port %>>
+<VirtualHost *:443>
   #
   # Basic server configuration
   #
   ServerName <%= node[:fqdn] %>
   ServerAlias api.openstreetmap.org www.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
-<% if port == 443 -%>
 
   #
   # Enable SSL
@@ -16,7 +14,6 @@
   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
-<% end -%>
 
   #
   # Setup logging
@@ -42,11 +39,7 @@
   RailsEnv production
   PassengerMinInstances 3
   PassengerMaxRequests 500
-<% if port == 443 -%>
   PassengerPreStart https://www.openstreetmap.org/
-<% else -%>
-  PassengerPreStart http://www.openstreetmap.org/
-<% end -%>
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
@@ -74,7 +67,6 @@
   RewriteRule ^/api/0\.6/(nodes|ways|relations)$ fcgi://127.0.0.1:8000$0 [P]
   RewriteRule ^/api/0\.6/changeset/[0-9]+/download$ fcgi://127.0.0.1:8000$0 [P]
 </VirtualHost>
-<% end -%>
 
 <Directory <%= node[:web][:base_directory] %>/rails/public>
   Require all granted