From d0e7baf48bf812a5c000c1e8d47a6fb9737d4d87 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 4 Nov 2019 22:55:04 +0000 Subject: [PATCH] sotm: support sotm.org short domain --- cookbooks/stateofthemap/recipes/default.rb | 4 ++-- cookbooks/stateofthemap/templates/default/apache.jekyll.erb | 3 ++- cookbooks/stateofthemap/templates/default/apache.static.erb | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb index 394d2d0d8..162c1002f 100644 --- a/cookbooks/stateofthemap/recipes/default.rb +++ b/cookbooks/stateofthemap/recipes/default.rb @@ -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 diff --git a/cookbooks/stateofthemap/templates/default/apache.jekyll.erb b/cookbooks/stateofthemap/templates/default/apache.jekyll.erb index 4010ce4bb..005996b11 100644 --- a/cookbooks/stateofthemap/templates/default/apache.jekyll.erb +++ b/cookbooks/stateofthemap/templates/default/apache.jekyll.erb @@ -2,7 +2,7 @@ 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 @@ ServerName <%= @year %>.stateofthemap.com + ServerAlias <%= @year %>.sotm.org ServerAdmin webmaster@openstreetmap.org CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined diff --git a/cookbooks/stateofthemap/templates/default/apache.static.erb b/cookbooks/stateofthemap/templates/default/apache.static.erb index af83be7a9..db543bb62 100644 --- a/cookbooks/stateofthemap/templates/default/apache.static.erb +++ b/cookbooks/stateofthemap/templates/default/apache.static.erb @@ -2,7 +2,7 @@ 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 @@ ServerName <%= @year %>.stateofthemap.com + ServerAlias <%= @year %>.sotm.org ServerAdmin webmaster@openstreetmap.org CustomLog /var/log/apache2/<%= @year %>.stateofthemap.org-access.log combined -- 2.39.5