Teach mailman cookbook about site aliases

[chef.git] / cookbooks / mailman / recipes / default.rb

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 6240d26968039fc1deb106ce50d45a4e7feaca98..cb7d4c1a968d8bdee33702b8f4ae90eca9b495f0 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -42,12 +42,13 @@ apache_module "expires"
 apache_module "rewrite"
 
 ssl_certificate "lists.openstreetmap.org" do
-  domains "lists.openstreetmap.org"
+  domains ["lists.openstreetmap.org", "lists.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
 apache_site "lists.openstreetmap.org" do
   template "apache.erb"
+  variables :aliases => ["lists.osm.org"]
 end
 
 template "/etc/cron.daily/lists-backup" do