Teach cgiirc about site aliases

diff --git a/cookbooks/cgiirc/recipes/default.rb b/cookbooks/cgiirc/recipes/default.rb
index 764a6255c91d2268b7d60f87f2379eeb4863f8a8..7f6cd355718873c79fe1a035735bf5dbe2d2e99d 100644 (file)
--- a/cookbooks/cgiirc/recipes/default.rb
+++ b/cookbooks/cgiirc/recipes/default.rb
@@ -39,10 +39,11 @@ template "/etc/cgiirc/ipaccess" do
 end
 
 ssl_certificate "irc.openstreetmap.org" do
-  domains "irc.openstreetmap.org"
+  domains ["irc.openstreetmap.org", "irc.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
 apache_site "irc.openstreetmap.org" do
   template "apache.erb"
+  variables :aliases => ["irc.osm.org"]
 end

diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb
index 780e54784d79cf71d6576e1f057112b7c152d7f4..21e67330832c6c3083afb99efecd676b08af609d 100644 (file)
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -29,9 +29,31 @@
                SetEnv no-gzip
        </IfModule>
 </VirtualHost>
+<% unless @aliases.empty? -%>
+
+<VirtualHost *:443>
+        ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>
+        ServerAlias <%= alias_name %>
+<% end -%>
+        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
+
+        RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+<% end -%>
 
 <VirtualHost *:80>
        ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
        ServerAdmin webmaster@openstreetmap.org
 
        CustomLog /var/log/apache2/<%= @name %>-access.log combined