X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/643f28e4f32f013c16d04378d7d1f3dd7d8edc17..9cdb601941af4b17abb5aedb75cadbe7376773a3:/cookbooks/mailman/recipes/default.rb

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 8fb1b9092..cb7d4c1a9 100644
--- 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,
@@ -19,7 +19,7 @@
 
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "mailman"
 
@@ -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