sotm: support sotm.org short domain
authorGrant Slater <git@firefishy.com>
Mon, 4 Nov 2019 22:55:04 +0000 (22:55 +0000)
committerGrant Slater <git@firefishy.com>
Mon, 4 Nov 2019 22:55:04 +0000 (22:55 +0000)
cookbooks/stateofthemap/recipes/default.rb
cookbooks/stateofthemap/templates/default/apache.jekyll.erb
cookbooks/stateofthemap/templates/default/apache.static.erb

index 394d2d0d872409318c4182e0eff66f4c398a3d74..162c1002f68c8f39c31a5a0832dfa1571909b2da 100644 (file)
@@ -270,7 +270,7 @@ end
   end
 
   ssl_certificate "#{year}.stateofthemap.org" do
-    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com"]
+    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"]
     notifies :reload, "service[apache2]"
   end
 
@@ -333,7 +333,7 @@ end
   end
 
   ssl_certificate "#{year}.stateofthemap.org" do
-    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com"]
+    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"]
     notifies :reload, "service[apache2]"
   end
 
index 4010ce4bbea10f9653380f36ad51c7f82dae374c..005996b11983c05e40c26bb6d35b8721f806b0cc 100644 (file)
@@ -2,7 +2,7 @@
 
 <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
@@ -14,6 +14,7 @@
 
 <VirtualHost *:443>
         ServerName <%= @year %>.stateofthemap.com
+        ServerAlias <%= @year %>.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined
index af83be7a9963a4865d09b99c9bf75aa4df9b7243..db543bb62a7a925f8c5894ee871d8073e80cf187 100644 (file)
@@ -2,7 +2,7 @@
 
 <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
@@ -14,6 +14,7 @@
 
 <VirtualHost *:443>
         ServerName <%= @year %>.stateofthemap.com
+        ServerAlias <%= @year %>.sotm.org
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined