From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Jun 2014 11:40:57 +0000 (+0100)
Subject: Allow direct addressing of nominatim servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/38df5ffe2eaed2d8f8d57193ad5e408763d66e5e

Allow direct addressing of nominatim servers
---

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index c92e07325..9f3dcd34b 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -2,13 +2,14 @@
 
 <% [80, 443].each do |port| -%>
 <VirtualHost *:<%= port %>>
-    ServerName nominatim.openstreetmap.org
-    ServerAdmin webmaster@openstreetmap.org
+    ServerName <%= node[:fqdn] %>
+    ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.osm.org
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
+    ServerAdmin webmaster@openstreetmap.org
 
 <% if port == 443 -%>
     #