From: Tom Hughes <tom@compton.nu>
Date: Fri, 21 Jul 2017 09:27:46 +0000 (+0100)
Subject: Add sotm.org as alias for stateofthemap.org
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a704f4b2d2279800b5b5ebe44e347510463731e6?ds=sidebyside;hp=852e345dc7c1b6fb6f8209546830d7b15b98954c

Add sotm.org as alias for stateofthemap.org
---

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index f069e0d49..b05dd8d19 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -31,7 +31,8 @@ end
 
 ssl_certificate "stateofthemap.org" do
   domains ["stateofthemap.org", "www.stateofthemap.org",
-           "stateofthemap.com", "www.stateofthemap.com"]
+           "stateofthemap.com", "www.stateofthemap.com",
+           "sotm.org", "www.sotm.org"]
   notifies :reload, "service[apache2]"
 end
 
diff --git a/cookbooks/stateofthemap/templates/default/apache.erb b/cookbooks/stateofthemap/templates/default/apache.erb
index 7ed9d9251..7cea946c4 100644
--- a/cookbooks/stateofthemap/templates/default/apache.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.erb
@@ -3,8 +3,10 @@
 <VirtualHost *:80>
         ServerName stateofthemap.org
         ServerAlias stateofthemap.com
+        ServerAlias sotm.org
         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
+        ServerAlias www.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
@@ -16,8 +18,10 @@
 
 <VirtualHost *:443>
         ServerName stateofthemap.com
+        ServerAlias sotm.org
         ServerAlias www.stateofthemap.org
         ServerAlias www.stateofthemap.com
+        ServerAlias www.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined