From: Grant Slater <git@firefishy.com>
Date: Sat, 4 Aug 2018 15:04:20 +0000 (+0100)
Subject: Teach blogs cookbook about site aliases
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/9cdb601941af4b17abb5aedb75cadbe7376773a3

Teach blogs cookbook about site aliases
---

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index a83740e17..da3b0da61 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -62,13 +62,14 @@ execute "/srv/blogs.openstreetmap.org" do
 end
 
 ssl_certificate "blogs.openstreetmap.org" do
-  domains "blogs.openstreetmap.org"
+  domains ["blogs.openstreetmap.org", "blogs.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
 apache_site "blogs.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/blogs.openstreetmap.org/build"
+  variables :aliases => ["blogs.osm.org"]
 end
 
 template "/etc/cron.d/blogs" do
diff --git a/cookbooks/blogs/templates/default/apache.erb b/cookbooks/blogs/templates/default/apache.erb
index 7986de430..507d48b19 100644
--- a/cookbooks/blogs/templates/default/apache.erb
+++ b/cookbooks/blogs/templates/default/apache.erb
@@ -1,30 +1,52 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <VirtualHost *:80>
-   ServerName <%= @name %>
-   ServerAdmin webmaster@openstreetmap.org
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+  ServerAdmin webmaster@openstreetmap.org
 
-   CustomLog /var/log/apache2/<%= @name %>-access.log combined
-   ErrorLog /var/log/apache2/<%= @name %>-error.log
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-   Redirect permanent / https://<%= @name %>/
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+  Redirect permanent / https://<%= @name %>/
 </VirtualHost>
+<% unless @aliases.empty? -%>
 
 <VirtualHost *:443>
-   ServerName <%= @name %>
-   ServerAdmin webmaster@openstreetmap.org
+  ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+  ServerAdmin webmaster@openstreetmap.org
 
-   CustomLog /var/log/apache2/<%= @name %>-access.log combined
-   ErrorLog /var/log/apache2/<%= @name %>-error.log
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
-   DocumentRoot <%= @directory %>
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-   SSLEngine on
-   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
-   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+<% end -%>
+
+<VirtualHost *:443>
+  ServerName <%= @name %>
+  ServerAdmin webmaster@openstreetmap.org
+
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+  DocumentRoot <%= @directory %>
 </VirtualHost>
 
 <Directory <%= @directory %>>
-   Require all granted
+  Require all granted
 </Directory>