Fix parent for stormfly-02

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

diff --git a/cookbooks/cgiirc/recipes/default.rb b/cookbooks/cgiirc/recipes/default.rb
index 9098d5a2b093b76eb17763004a42acbd0f3bb621..4e8a9c1cc934da05de1dacbcd7a35cb81075257f 100644 (file)
--- a/cookbooks/cgiirc/recipes/default.rb
+++ b/cookbooks/cgiirc/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: cgiirc
+# Cookbook:: cgiirc
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
@@ -27,17 +27,23 @@ template "/etc/cgiirc/cgiirc.config" do
   source "cgiirc.config.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/cgiirc/ipaccess" do
   source "ipaccess.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :blocks => blocks["addresses"]
 end
 
+ssl_certificate "irc.openstreetmap.org" do
+  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