Avoid exception iterating a non-existent directory

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

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 0d08e322b1770c8faa9586625cfb95533eaae6f9..8c397db8a6f943e8725cc6aec8a13f4767f4f205 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: trac
+# Cookbook:: trac

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -62,7 +62,7 @@ execute "trac-deploy-#{site_name}" do
   command "trac-admin /var/lib/trac deploy #{site_directory}"
   user "root"
   group "root"
   command "trac-admin /var/lib/trac deploy #{site_directory}"
   user "root"
   group "root"

-  not_if { File.exist?(site_directory) }
+  not_if { ::File.exist?(site_directory) }

 end
 
 cookbook_file "/usr/local/bin/trac-authenticate" do
 end
 
 cookbook_file "/usr/local/bin/trac-authenticate" do


@@ -74,14 +74,14 @@ end
 apache_module "wsgi"
 
 ssl_certificate "trac.openstreetmap.org" do
 apache_module "wsgi"
 
 ssl_certificate "trac.openstreetmap.org" do

-  domains "trac.openstreetmap.org"
+  domains ["trac.openstreetmap.org", "trac.osm.org"]

   notifies :reload, "service[apache2]"
 end
 
 apache_site site_name do
   template "apache.erb"
   directory site_directory
   notifies :reload, "service[apache2]"
 end
 
 apache_site site_name do
   template "apache.erb"
   directory site_directory

-  variables :user => "trac", :group => "trac"
+  variables :user => "trac", :group => "trac", :aliases => ["trac.osm.org"]

 end
 
 template "/etc/sudoers.d/trac" do
 end
 
 template "/etc/sudoers.d/trac" do