sotm: support sotm.org short domain

[chef.git] / cookbooks / stateofthemap / templates / default / apache.static.erb

diff --git a/cookbooks/stateofthemap/templates/default/apache.static.erb b/cookbooks/stateofthemap/templates/default/apache.static.erb
index af83be7a9963a4865d09b99c9bf75aa4df9b7243..db543bb62a7a925f8c5894ee871d8073e80cf187 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.static.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.static.erb
@@ -2,7 +2,7 @@
 
 <VirtualHost *:80>
         ServerName <%= @year %>.stateofthemap.org
 
 <VirtualHost *:80>
         ServerName <%= @year %>.stateofthemap.org

-        ServerAlias <%= @year %>.stateofthemap.com
+        ServerAlias <%= @year %>.stateofthemap.com <%= @year %>.sotm.org

         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined


@@ -14,6 +14,7 @@
 
 <VirtualHost *:443>
         ServerName <%= @year %>.stateofthemap.com
 
 <VirtualHost *:443>
         ServerName <%= @year %>.stateofthemap.com

+        ServerAlias <%= @year %>.sotm.org

         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined