From: Grant Slater <git@firefishy.com>
Date: Fri, 28 Feb 2014 11:26:24 +0000 (+0000)
Subject: nominatim: enable ssl
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b4aedce6d4a03bb275d45b32934c40bba5e06774

nominatim: enable ssl
---

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 6f3394403..448064300 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 include_recipe "postgresql"
 include_recipe "git"
 
diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 010b27ad8..120bccece 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -1,6 +1,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<VirtualHost *:80>
+<% [80, 443].each do |port| -%>
+<VirtualHost *:<%= port %>>
     ServerName nominatim.openstreetmap.org
     ServerAdmin webmaster@openstreetmap.org
     ServerAlias nominatim.osm.org
@@ -9,6 +10,13 @@
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
 
+<% if port == 443 -%>
+    #
+    # Enable SSL
+    #
+    SSLEngine on
+<% end -%>
+
     CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
 
@@ -54,3 +62,5 @@
     RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT]
 
 </VirtualHost>
+
+<% end -%>