Allow direct addressing of nominatim servers

[chef.git] / cookbooks / nominatim / templates / default / apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index c92e07325d4db9ba36a59275418dfc77e6eab1a0..9f3dcd34b9d314ff950b56161e73bbbd01ce80dd 100644 (file)
--- 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 %>>
 
 <% [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
     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 -%>
     #
 
 <% if port == 443 -%>
     #