X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5d511fe466e334435ca1e578c44558a57369ffea..c3d81537a9d49c65f5801a19ba2920713beeeb81:/cookbooks/cgiirc/recipes/default.rb

diff --git a/cookbooks/cgiirc/recipes/default.rb b/cookbooks/cgiirc/recipes/default.rb
index 173eebfdd..7f6cd3557 100644
--- a/cookbooks/cgiirc/recipes/default.rb
+++ b/cookbooks/cgiirc/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,
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 blocks = data_bag_item("cgiirc", "blocks")
 
@@ -39,11 +39,11 @@ template "/etc/cgiirc/ipaccess" do
 end
 
 ssl_certificate "irc.openstreetmap.org" do
-  domains "irc.openstreetmap.org"
-  fallback_certificate "openstreetmap"
+  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