Handle server_url being commented out in the example configuration

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

diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb
index 455a1cac39bb1fee3eafc0a9b566498284e3490b..c65e2c74a95a39551b199dba656c52b8d58c15ec 100644 (file)
--- a/cookbooks/owl/recipes/default.rb
+++ b/cookbooks/owl/recipes/default.rb
@@ -36,8 +36,6 @@ gem_package "bundler#{node[:owl][:ruby]}" do
   options "--format-executable"
 end
 
   options "--format-executable"
 end
 

-apache_module "deflate"
-

 apache_module "passenger" do
   conf "passenger.conf.erb"
 end
 apache_module "passenger" do
   conf "passenger.conf.erb"
 end


@@ -84,7 +82,7 @@ end
 directory "/srv/owl.openstreetmap.org" do
   owner "owl"
   group "owl"
 directory "/srv/owl.openstreetmap.org" do
   owner "owl"
   group "owl"

-  mode 02775
+  mode 0o2775

 end
 
 file "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt" do
 end
 
 file "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt" do


@@ -123,12 +121,12 @@ template "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/datab
   source "database.yml.erb"
   owner "owl"
   group "owl"
   source "database.yml.erb"
   owner "owl"
   group "owl"

-  mode 0664
+  mode 0o664

   notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
   only_if { node[:postgresql][:clusters][:"9.1/main"] }
 end
 
 apache_site "owl.openstreetmap.org" do
   template "apache.erb"
   notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
   only_if { node[:postgresql][:clusters][:"9.1/main"] }
 end
 
 apache_site "owl.openstreetmap.org" do
   template "apache.erb"

-  variables :aliases => [ "owl.osm.org" ]
+  variables :aliases => ["owl.osm.org"]

 end
 end